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

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