PIM-2230 : fix CS
Merge branch 'master' into PIM-2230