Merging with upstream commits.