Merge "Sonar fix: XmlParser.java"