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

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