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

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