x64-upstream: Rebase to r260492