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

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