Fixed column management
Merge remote-tracking branch 'origin/column-fix' into devel

author: nhhughes