[automated] Merge branch 'release/3.0' => 'master'\n\nCommit migrated from a070a8198b
a070a8198b
836085b62a