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

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