Merge branch 'hotfix/h5_xml_file'
h6
version number
Merge branch 'hotfix/h6_version_number' into develop