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