Merge change 26280 into eclair

* changes:
  Another doc update.