Issue #2224779 by swentel: Move 'column_groups' out of settings in a dedicated annotation.