Merge from original repository