Merge change 1622 into donut

* changes:
  Fix typos.