Crm 12639 fix 

CRM_12639_fix : sending a clean PR after #1272 produced merge conflict