CRM-12689

worked on CRM-12689