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

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