Merge change 2737 into donut

* changes:
  Fixes #1878499.