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

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