Merge change 25749 into eclair

* changes:
  Fix for 2023896