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

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