additional changes for CRM-15889