Merge branch 'develop' into bug/JAL-4353_cannot_output_multiple_different_structure_i...