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

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