Merge branch 'bug_347_adenin_unicable_xml' into experimental