Merge with latest MERC changes