Make some doc comments more consistent
Merge branch 'fix-entity-controller' into develop