Merge branch 'dev'
Merge branch 'dev'
fix check on undefined entity property