EVP_edit_picture
Merge branch 'test' into dev