Merge change 2732 into donut

* changes:
  Fix for #1878497.