Merge pull request #273 from eric-wu/develop

Merge release-1.16 patch back to develop