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

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