Merge "Changes for the Rust 1.59.0 update"