Merge change Iaca22686 into eclair

* changes:
  Work on issue #2163789: Way too much logging