Merge branch 'add-general-adhoc-group-ui'