Merge "Fix notification bug." into oc-dev