Merge change I228d52db into eclair

* changes:
  Three changes.