Merge "Introduced DomainSpecificRegistry service"