Merge change 1369 into donut

* changes:
  Updated a comment.