Merge pull request #2800 from BrzVlad/feature-lazy-sweep