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

This reverts commit 25a9f2ad0495efcc9933db413044347a878ea528.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the navfn sub directory