PIM-2127 : fix merge issue