Merge changes I6227bea2,Ibf3daaca

* changes:
  Documentation improvements.
  Documentation improvements.