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

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