Merge change 2962 into donut

* changes:
  Fixes #1890914.