Merge branch 'release-candidate' into stable