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