DEV-20620 xml_data
Merge branch 'master' into releases