CRM-14241, added entities generated from xml