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