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