Merge "BUG 484 - XmlReader improve readability"