CRM-16222-PR improvement