Merge branch 'bugfix/caching-activity-delete' into 'develop'