Merge change 7079 into donut

* changes:
  Cleanup of unused enums