Merge branch 'xmlgen-bug-fixes'