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

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