Merge "Update logic for resolving verifiers."