Merging upstream code