fixed uuid
if no image don't touch
Merge remote-tracking branch 'origin/master'