Merged changes for images.