Merged Diagnostics project with Service for now.