HV-749 Updating XML parsing code

To be pulled in after the CR2 release.