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