Merge change 3192 into donut

* changes:
  Fixes #1882836.