refactor: Entity property conversations
Pro submodule
Merge remote-tracking branch 'origin/development' into development