Merge "Convert InsetsOEMV1 and TabOEMV1 to data objects" into sc-dev