Merge branch 'spi/next' (early part) into spi/merge