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

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