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

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