API changes upstream (IDEX-569)