Merge changes from upstream and prepare for pull request