Merged hg changes, sweeper