BC-2370 #resolve fixed for adding/deleting/modifying images
Merge branch 'master' of git@github.com:soluvas/soluvas-framework.git