Merge change 969 into donut

* changes:
  fix bug 1496878