PIM-2515: Fix CS