Merge "Knock ::self() out of the ParseXml profile." into ics-mr1