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

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