Attempt to sync to Rust master