Merge branch 'Add-Activity'
Merge branch 'master' into Add-Activity