Merge commit 'v3.4' into x86/urgent