Merge commit 'be91fdbc5c4f2de3a2bb574a98fdfeef44d8cdb5' * commit 'be91fdbc5c4f2de3a2bb574a98fdfeef44d8cdb5': Fix resources not being set correctly.
Merge commit 'be91fdbc5c4f2de3a2bb574a98fdfeef44d8cdb5' * commit 'be91fdbc5c4f2de3a2bb574a98fdfeef44d8cdb5': Fix resources not being set correctly.