Merge remote-tracking branch 'spi/fix/locking' into spi-next