Merge branch 'columnmanager'