Rolling up PRs in the queue

Adopting PR #19342