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

This reverts commit 4e5caa8eba24116443323fc595c5e7c762269f14.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the strands_base sub directory