Merge branch 'release-candidate'