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

This reverts commit b3796f61b3d5829f4c98588b4f5a50a036287b63.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the ndt_mcl sub directory