Fix column definition can not accept widget
Merge branch 'master' into 1.2