Merged changes to Sweeper from hg repository