Merge branch 'fix/scrubber-cache' into 'develop'