update_XML
Merge branch 'master' into cloud