CRM-12451

fixes for CRM-12451