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