Merging changes from upstream