Fix CRM-14353 and CRM-14697