Merge branch 'release-1.6.x' into release-1.7.x
Merge branch 'release-1.7.x'