Merge from original