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

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