Merge changes in upstream