Merge remote-tracking branch 'spi/topic/pump-rt' into spi-next