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

internal: sync from downstream