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

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