Merge commit 'v3.5-rc3' into x86/debug