Preparations for cropped and scaled surfaces

Cleanup commits for !3177 (merged)

Merge request reports

Loading