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

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