x64-upstream: Rebase to 259174