Merge change 4579 into donut

* changes:
  Fix issue #1924851