x64-upstream: Rebase to @258213