Merge change 2331 into donut

* changes:
  Fix issue 1846343 - part 1