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

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