Merge branch 'add-general-adhoc-group-ui'
sample changes cleanup
Merge branch 'master' into add-general-adhoc-group-ui