Merge change 24814 into eclair

* changes:
  Enable log message for tracking issue #2092299.