Merged from widget_dev