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

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