Merge branch 'timers/urgent' into timers/core

Pick up urgent fixes to apply dependent cleanup patch