Merge commit 'v2.6.35-rc6' into spi/test