fix for group view
prep merge
Merge branch 'dev'