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

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