Issues/1910 handle own images

Closes #1910