Merge branch 'bug/JAL-2245enaXmlChange' into develop