Manually merge changes from upstream