LPS-45368 Proper registration (and un-registration) of some registries