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

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