Merge branch 'bug/JAL-3388structureChooserSorting' into develop