Merge change 20891 into donut

* changes:
  Updated whitespace