bugfixes in entity aware model
Merge remote-tracking branch 'origin/dev' into dev