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

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