Merge tag 'v4.0-rc5' into x86/fpu, to prevent conflicts