Merge commit 'v2.6.34' into next