Merge "Fix bug in verifier: hard fail allowed following softfail"