Merge "Remove the scaling code" into main