Merge branch 'release-1.7.x'
Merge remote-tracking branch 'origin/master'