Merge pull request #263 from eric-wu/develop

Merge branch 'release-1.16' patch into develop