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

This reverts commit 3f1a6513bb953610b0dd4483b8efbe352d30be0f.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the ndt_map sub directory