SOC-4161: Replace Object type by primitive type