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

This reverts commit 63ef45222f5190620f5325c7f48654d879276c23.
Rebase from 'upstream'
Trimmed the branch to only the strands_base sub directory