Merge "Use ObjectRegistration instead of Registration"