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

This reverts commit 54c874d1d76cf47a19b1bf9a36d5d41cb50c8e16.
Rebase from 'upstream'
Trimmed the branch to only the navfn sub directory