Merge change 952 into donut

* changes:
  Debug: Minor cleanup