Merge XML namespace fixes and minor style & comment updates