merge upstream patches