Merge "Use ExtensionRegistry instead of class name"