[beta] backports#148591

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

cuviper:beta-nextcuviper/rust:beta-nextCopy head branch name to clipboard