CRM-12926 : more improvements