x64-upstream: Rebase to 276950