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

This reverts commit afafda2e9914d3ce84c2281bb11be11fb2f12b43.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the FreNaP sub directory