x64-upstream: Rebase to 266729