Merge branch 'improvement/JAL-1350_makegroups_markedcolumns' into merge/JAL-845_JAL...