4.3 smarty crm 5890

CRM-12750 - Smarty - Restore patches from CRM-5890