Merge commit 'v2.6.35-rc3' into next