Merge change 6665 into donut

* changes:
  Fix resources not being set correctly.