Merge change 4657

* changes:
  Method override tests.