Merge change Ib1b7bce4 into eclair-mr2

* changes:
  Squashed commit of the following: