Code review feedback
Merge remote-tracking branch 'origin/make_timers_redundant' into make_timers_redundant