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

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