Merge "Update code for Rust 1.82.0" into main