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

This reverts commit 2461f386f4a571147d9ecb2dc4ad86ecf0b07e78.
Rebase from 'upstream' @ version '0.3.17'
Trimmed the branch to only the warehouse sub directory