Merge upstream developments