Merge branch 'release/3.0' into merge/master-to-release/3.0