[US2496] Fix redefined type error in XML
Merge pull request #327 from khogenso/devel

[US2496] Fix redefined type error in XML