Merge branch 'merge' into release-2.6.27