Fixes #7647: Added support for external registries

I think this will break 1.6 compatibility unfortunately, it is quite a convenience.