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

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