Merged hg changes