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

This reverts commit f89613990efebe234e7b865b94d1ab7012adf33d.
Rebase from 'upstream'
Trimmed the branch to only the nao_extras sub directory