Prepare to merge upstream