OC-2678: Changes in ShareXMLParser