Merge changes from upstream