Merge "Using RegistrationManager was causing unintended public APIs" into rvc-dev