Merge from OSE