Merge remote-tracking branch 'spi/for-next'