PIM-3223: Updated changelog
PIM-3223: Fix cs