Merge tag 'spi-3.6' into v3.5-rc7-dt-v3