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

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