fix
Merge branch 'expectedoutput_failoption' into beta