Added Language and IP to default Entity
Merge branch 'hotfix/1.3.1'