Merge "Simplify xml-json inheritance in identity"