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

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