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

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