Added support for images. Bug fix #6359