Merge remote-tracking branch 'spi/topic/nuc900' into spi-next