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

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