DEVEN-201 cleanup Imagecreation for Errors
Merge remote-tracking branch 'origin/master'