Merge branch 'bug_718_timer_sanitycheck_robustness'