fix entity
Merge branch 'datastore-entity-index' into datastore-orm-model-index
Merge branch 'datastore-orm-model-index' into dev