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

This reverts commit 8d021ce5e9c905596a5b41fed71babb4999c5f6b.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the neo_base_mp_500 sub directory