Merge branch 'release-2.7.0'
Merge branch 'master' into unstable