Add all 12 columns.
Merge remote-tracking branch 'origin/dev'