Merge release-1.16 patch back to develop