Rolling up PRs in the queue

(addendum from pnkfelix: This is a retry of a previous manual rollup PR #19931 )