Summary: Pass all images provided by user code to the system and let it do the right thing
Reviewed-by: art, swingler