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

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