Merge branch 't6_widget'