Merge from originam