ref #8450 Disable re-ordering of columns
Fix potential NPE
fix #8485 Add column groups to character matrix