Merge branch 'hotfix/delete-activities' into 'develop'