Merge branch 'networking-Convert-timers-to-use-timer_setup'