Add some missing entity descriptions in doc comments
Merge branch 'fix-entity-controller' into develop