Merge branch 'fix/activity-deletion' into 'develop'