ticket:6 fix widget
Merge branch 'master' into t6_widget
ticket:6 fix widget