am 5493df91: am bbd6cb46: Merge change Ib1b7bce4 into eclair-mr2

Merge commit '5493df919b01952857eb3b78fad3fe2cff573935'

* commit '5493df919b01952857eb3b78fad3fe2cff573935':
  Squashed commit of the following: