Merge change 3317 into donut

* changes:
  Fixes #1899273.