rebase to rust master