Merge change 6187 into donut

* changes:
  Fix strings.