Fixes doctrine configuration errors resulting in inconsistent entities
Merge branch 'fix-entities'