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

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