Merge branch '3632_widget_flags'