Merge change 21311 into eclair

* changes:
  fix documentation