More column conversions
Merge pull request #3567 from cchantep/backport-3243

Backport #3243: More column conversions