Fix #2076: Cannot use more than one activity integration at once
Merge pull request #2122 from mahagr/master

Fix #2076: Cannot use more than one activity integration at once