Merge upstream commit