Merge change I7d67e1b3 into eclair

* changes:
  docs: small edits