Fixes #6419
Merge pull request #6423 from mwerezak/scrubber

Fixes #6419