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

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