Merge "add channel and group tags to the notificaiton logs" into oc-dev