Sync up with emh-1_6_0-pre1.