Merge branch 'shipimages'