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

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