Entities API Identity test
Refactoring
Test DefinitionEntity
Merge remote-tracking branch 'origin/v3-dev' into v3-dev