Merge tag 'v6.8-rc5' into timers/core, to resolve conflict