Merge tag 'v3.8-rc6' into x86/urgent