[JBTM-1699] SPI changes (used by ceylon)