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

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