Merge "Fix bug in verifier: soft fail was hiding hard fail."