Merge change 22986 into eclair

* changes:
  Squashed commit of the following: