Merge branch 'refactor/object-cache-deletion' into 'develop'