Merge branch 'bug_668_segfault_on_e2_restart_with_running_record_timer'