CRM-9419 Changes