Merge change 6154 into donut

* changes:
  Fix bug (#1947162)