Develop pull request from Meng

For release 1.2.1-beta17