Merge change 23738 into eclair

* changes:
  fix doc