Merge branch 'scheduled-activities' into 'develop'