Merge pull request #5976 from jkarni/jkarni/update-resourcet

I'll merge blindly, assuming that those changes have been tested by the submitter. If these updates cause any trouble, please don't hesitate to revoke if necessary.