Issue #8484 by tj, comments and refactor
Merge branch 'development' of github.com:Indholdskanalen/indholdskanalen into development
Removed Exclude from entity
Merge branch 'development'