Merge branch 'feature/image_editor' into develop