Merge "Allow verifier to be optional" into oc-dev