Merge change 21340 into eclair

* changes:
  Squashed commit of the following: