Merge change 1932 into donut

* changes:
  Qualify a type and add some explanatory comments.