Merge upstream's changes