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

This reverts commit 18c4753e2cfcae31bd689df0822ce035c65169f4.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the ndt_map sub directory