Merge change 7442

* changes:
  Make verifier field/method resolution conformant.