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

This reverts commit dee96089dfd9ed41011c7bcd8285cb0892ec3622.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the diagnostic_analysis sub directory