Handles timer callback restarting it
Merge branch 'reentrant-timer' into 'master'