Merge pull request #17 from ActivityRez/task-activity-manager

[Delivers #81533810] Task activity manager also handles 80596830