Merge from original git