fixes for CRM-14013