changes merge upstream