Revert "Trimmed the branch to only the resource_retriever sub directory"

This reverts commit 1d3bc0a03116e6628f479d49404e8b6873003572.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the resource_retriever sub directory