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