Merge branch 'release_candidate' into release