Merge change 25297 into eclair

* changes:
  Address romain's code review comments