Merge branch 'feature-concurrent-sweep'