PIM-3244 : merge 1.2 fix on master