Merge branch 'efcs-skip_with_error'