Product photo editing fix
Merge branch 'dev'