Handle FlexEntity with entity_from_mongo
Merged