Merge change 5761 into donut

* changes:
  Misc cleanup from a previous commit.