allow image_id not to be set
Merge remote-tracking branch 'origin/dev' into dev