Catch case where there is no image in the images collection
Merge branch 'mbst-3790-prototype-images-node' into stage