Merge pull request #1402 from open-data/feature/pd-activity-streams

Merge pull request #1402 from open-data/feature/pd-activity-streams #819