Merge change 415 into donut

* changes:
  code cleanup