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

This reverts commit 440a75dc6e08429eca84fe221ecee6a695969fae.
Rebase from 'upstream' @ version '0.3.21'
Trimmed the branch to only the warehouse sub directory