Merge change 6805

* changes:
  Changes 203 and 225 from partner repo.