crm-12639-fix : more improvements