Merge pull request #19726 from lnicola/sync-from-rust

Sync from downstream again