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

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