Merge branch 'spi-5.1' into spi-5.2