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

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