Fix entities
Merge branch 'master' into 1t