Merge change 6367 into donut

* changes:
  Add virtual destructor.