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

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