16-Enhanced-templates-diagnostics

Enhanced templates diagnostics