Merge commit 'v2.6.39' into spi/next