Merge change I882d2eb8 into eclair

* changes:
  do not merge