Merge change 8557 into donut

* changes:
  Merge doc change from cupcake: commit '2c44586d118208bdddfc727165ebf235fe7c0051'