PIM-2696: Fix CS