Rust upgrade for new master rebase