Merge change 25302 into eclair

* changes:
  Add more features.