ticket:6 finish
Merge branch 't6_widget'