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

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