Merge remote-tracking branch 'public/release_candidate' into release