Merge change Ie3890f91 into eclair

* changes:
  Fixes