Merge branch 'remove-images' into hc