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

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