CRM-7564

#fixes for CRM-7564