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