Start adding XML formatting for conformance
Merge remote-tracking branch 'origin/master'