Merge "Fixed an issue where USER_ALL notifications were showing" into oc-dev