Merge "Update needed for Rust v1.77.0" into main