Merge branch 'spi-4.17' into spi-4.18 for the merge window