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

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