Merge upstream cotire