Merging upstream updates