Upgrade to use latest Resources package and refresh mocks
Merge pull request #2698 from ogail/tags

Upgrade to use latest Resources package and refresh mocks