Merge change 4106 into donut

* changes:
  Adjust order of file/section list in output diff