Merge tag 'v3.7-rc8' into spi/next