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

This reverts commit 54282d0e825d5f097a420ee1acabcc98a34f104b.
Rebase from 'upstream' @ version '0.3.16'
Trimmed the branch to only the warehouse sub directory