Fixing nocms -> no_cms
Merge branch 'fixes/wrong-image-delete'