Merge change I0d9344aa into eclair

* changes:
  Fixed