Merge branch 'feature/verbose-feature-list' into develop