Merge emh-1_9_0.