Merge branch 'timers/urgent'