Merge branch 'timers/urgent' into timers/core

Pick up dependent changes.