Merge "send broadcast to the right users" into oc-dev