Merge change 8677 into donut

* changes:
  DO NOT MERGE.