x64-upstream: Rebase to 272392 and include 272261 fix