Handle entities that have a root set
Handle entities that have a root set
Merge branch 'add_entity_root_support'