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