externalized commentable behaviour configuration
Merge branch 'dev' into feature/ui