[automated] Merge branch 'release/3.0' => 'master'\n\nCommit migrated from 65707ffbcc
65707ffbcc
ad8ba0cbe4