Merge branch 'feature/image_scale_editor' into develop