Set proper type for numeric columns
Merge branch 'column_type' into version_1_2