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

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