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

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