Merge branch 'timers/core' into perf/timer, to apply dependent patch