Additional commit for CRM-15838