Merge branch 'release-1.16' patch into develop