Merge branch 'spi-5.3' into spi-5.4