Merge branch 'timers/core'