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

This reverts commit 5432c229d8229165b3ce0c77e14e27e369737b75.
Rebase from 'upstream'
Trimmed the branch to only the diagnostic_analysis sub directory