Merge pull request #12526 from apple/verifier_fix

Merge pull request #12484 from shajrawi/relax_verify