Merge pull request #271 from eric-wu/release-1.16

Patch Release 1.16 for PLFM-1670, PLFM-1672
Merge pull request #274 from eric-wu/release-1.16

PLFM-1627 More fix
Merge branch 'release-1.16' into develop