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

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