Merge remote-tracking branch 'spi/for-5.18' into spi-5.18