Merge change 2731 into donut

* changes:
  Fixes #1873537.