Merge commit 'v2.6.36-rc1' into HEAD