Merge branch 'bug_635_timer_sanity_check_speedup' into experimental