Merge change 22939 into donut

* changes:
  Final Donut API list.