Auto merge of #16983 - lnicola:sync-from-rust, r=lnicola

minor: sync from downstream