Merge branch 'release/3.0.0-RC3' into develop