Small change to support StopOnFirstFailure between rule chains