CRM-12463

more changes