PLFM-1627 More fix
Merge pull request #274 from eric-wu/release-1.16

PLFM-1627 More fix