CRM-13046

fixes for CRM-13046