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

This reverts commit a6c3629b03e52f5be2586a5253c5c82c14403a34.
Rebase from 'upstream' @ version '0.3.20'
Trimmed the branch to only the warehouse sub directory