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

internal: Sync from downstream