Merge branch 'master' into test-merge-for-6.11-rc4-fixes