Merge change 4885 into donut

* changes:
  Merge the output file into one.