Merge change I895fb7d7 into eclair-mr2

* changes:
  Squashed commit of the following: