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

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