Merge commit 'v2.6.36-rc7' into spi/next