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

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