Merge "Use new Severity class and update *_warn_patterns"