Merge change 3775 into donut

* changes:
  DO NOT MERGE.