Cherry-picked all XML_gen changes from master into the release branch

Closes ROHD-2653

Merge request reports

Loading