Backport #3243: More column conversions