Merge branch 'release' into release_candidate