Improved: Merge extended entity definition in data model component into the existing entity definition (OFBIZ-9581) Thanks Aditya Sharma for your contribution.