Merge change 1677 into donut

* changes:
  Findbugs fixes.