Merge from the original repo