Merge branch 'hotfix/1.0.2'
Fix entity imports
Merge branch 'hotfix/1.0.3' into develop