Merge change 21931 into eclair

* changes:
  API CHANGE