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

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