cherry-pick of PR #24553 to [beta]#24943

alexcrichton merged 2 commits intorust-lang:betarust-lang/rust:betafrom

pnkfelix:beta-cherrypickpnkfelix/rust:beta-cherrypickCopy head branch name to clipboard