Merge branch 'bug/JAL-3212columnSelectionWithHidden' into develop