Merge commit 'v3.2-rc6' into x86/platform