number type column is included in null may be treated as number type
Merge branch 'uidev'