merge upstream fix