Merge change 9366

* changes:
  Implement op=.