Merge from upstream repository