Rebase on top of GMP-API changes landed today.