PIM-3309: prevent BC break
PIM-3309: Fix cs