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

This reverts commit 3043ba0c3d9c3a8c7bfde9080cbd1777c15b294a.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the hrpsys sub directory