Merge pull request #7504 from JosJuice/game-id-partition-none Fix issue 11422 (inconsistent game ID for some hacked games)