Merge branch 'release-3.16' into release-3.17