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

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