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

This reverts commit bd7309145315ff34da1abee73ef036500e044cc5.
Rebase from 'upstream'
Trimmed the branch to only the ndt_map sub directory