Fix issues with xml file
Merge branch 'uth' into autostaging