Merge change 3981 into donut

* changes:
  Removed trailing whitespaces.