Merge "Changes for Rust 1.72" into main