am d4e57d4c: Related work on issue #2170897.

Merge commit 'd4e57d4cb45c0c7db605420dccd9fd4db854e998' into eclair-mr2

* commit 'd4e57d4cb45c0c7db605420dccd9fd4db854e998':
  Related work on issue #2170897.