Revert "Revert "Merge pull request #4328 from guardian/discussion-activity""

This reverts commit 7d0c2157afdaec1c351150a8383ae4c0d7b057ea.
Merge pull request #4340 from guardian/discussion-activity

Revert