Merge branch 'release-6.0rc2'
Merge branch 'master' into develop