Merge change Ibc1b1f7d into eclair

* changes:
  Follow up changes from review of Ib2afc992.