Merge branch 'develop' into feature/image_scale_editor