Merge from Hok