Merged with ExpandableFramework