Merge "Fixing service notification on secondary users" into oc-dev