Merge "BUG-997: Evolve the SchemaRegistry concepts"