Merge change I49b05da2

* changes:
  Various XML fixes.