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