Merge upstream changes