CRM-12778 --worked on issues