issue #21836: Swat.
issue #21836: Add support to drill into activities.
Merge pull request #995 from jrogelstad/21836a

issue #21836: More support for activities