Merge branch 'feature/surface-scaling'