Merge change 24630 into eclair

* changes:
  resolved conflicts for merge of e0408aa1 to eclair