x64-upstream: Rebase to 253062