Merge branch 'develop' into bug/JAL-4290_headless_alignment_export_with_structure_ann...