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

This reverts commit 6c29edd6e53dd88305f94a0410238795243e3c13.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the strands_hri sub directory