upstream API changes