Merge branch 'release-3.17' into release-3.18