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

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