-- CRM-12682 applied patch and made some modifications