Merge change I74bf38a0 into eclair-mr2

* changes:
  Squashed commit of the following: