Merged 5692
Sweeper bug fix