Merge branch 'bug_241_EOFrestart' into experimental