Revert "Revert "Merge branch 'fix/activityservice-provider-issue' into 'master'""