Merge change 24274 into eclair

* changes:
  API_CHANGE