Merge branch 'bpf-timers'