PIM-2372: Temporary commit for common attributes in ODM