Merge change 9430

* changes:
  Update docs.