Merge latest changes of "master" to 9.2 wip branch #152

Closed cheemingli closed 5 years ago