Merge "Add group name into channel summary, if applicable." into oc-dev