Merge remote branch 'origin/bug_347_adenin_unicable_xml'