Merge tag 'v4.0-rc2' into irq/core, to refresh the tree before applying new changes