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

This reverts commit 8de0c8a6f6e2cf048086f1075867052e5c4d8302.
Rebase from 'upstream'
Trimmed the branch to only the diagnostics sub directory