Merge branch 'bug/JAL-2374_JAL-2419_overlappinggroups_currentselection_popupmenu...