Merging activity-completed event from master
Merge branch 'activities-1-3-dev' into activities-1-3