Merge change 1055 into donut

* changes:
  Fix issue 1687880.