Merge tag 'v4.0-rc2' into x86/asm, to refresh the tree