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