Merge change 6814

* changes:
  Change 107 and 146 from partner repo.