Merge change 24509 into eclair

* changes:
  Addressed reviewer comments.