Merge change 132 into donut

* changes:
  Let's do bug #1769910 actually right.