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

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