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

This reverts commit 8492040cee625636534de681c531bc75188d933e.
Rebase from 'upstream'
Trimmed the branch to only the hrpsys sub directory