manual merge into develop branch from #306 from @joachimmetz to add external type to image layer