Merge tag 'v4.0-rc2' into timers/core, to refresh the tree before pulling more changes