Fixed issue with image delete process and main image logic
Merge branch 'hotfix-1'