Merge "Adapt recorded scaling in X and Y" into main