x64-upstream: Rebase to @255909