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

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