Proper step type
merged
Fixed infinite loop / SOE in `onFailure` and added test