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

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