Fix CS
PIM-2261 : fix attribute as label
Merge branch 'master' into PIM-2255