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

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