Merge commits from upstream