Merge branch 'features/JAL-2113_emblXml1.2' into develop