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

This reverts commit 4a038948f71644bab0fe4c225d6db609b40cabd0.
Rebase from 'upstream'
Trimmed the branch to only the bwi_common sub directory