Merge "Add user to channel/group modification callbacks." into oc-dev