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