Partial revision of widget choices.
Merged.
Partial for widget attribute.
Widget collection.