[generic] Backport SPI from 2.6.36.