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