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

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