Merge branch 'release-1.6.11'