Patches to 4.3 for CRM-15510 and CRM-15251