Merge commit 'v2.6.32' into next