Refactor project watchers collecting.
 Merge branch 'refactor_project_watchers_notifications' into 'master'

Refactor project watchers notifications