Merge branch 'delete_orphaned_activities' into develop