Merge change I60bed5d3 into eclair

* changes:
  Log for issue 2203561.