Merge "Move the scaling logic for gamemode" into main