Merge change I5bbd2294 into eclair-mr2

* changes:
  For Ying Wang: