Merge remote-tracking branch 'spi/topic/build' into spi-next