PIM-3377: Fix cs for static analysis