Merge change Ifb9d6df3 into eclair

* changes:
  More log for issue 2242381.