PIM-1568 Spread usage of ODM custom types "entity" and "entities"
PIM-1568 Improved ODM custom type "entities" exception message