Merge for upstream