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

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