Merge remote-tracking branch 'spi/for-5.20' into spi-6.0