image id is null now when not find image, fix merged messages,
Merge remote-tracking branch 'origin/DAT-2156_Curated_Content' into DAT-2156_Curated_Content