Implementing the rest of the Notifications API
Merge branch 'activity-work-backport' into release-0.6