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

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