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

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