Merge branch 'spi-5.2' into spi-5.3