ENCH: Major merge including a few tests.