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

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