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

This reverts commit 86461b9ba3f7d076722e466f553258e233a0e55e.
Rebase from 'upstream'
Trimmed the branch to only the ndt_mcl sub directory