Fixes #7647: Added support for external registries