Backport 9614 to 4.0#9621

hsbt wants to merge 3 commits into

4.0ruby/rubygems:4.0from

backport-9614-to-4.0ruby/rubygems:backport-9614-to-4.0Copy head branch name to clipboard