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

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