@itwin/core-backend 5.10.0-dev.8 → 5.10.0

package/lib/esm/test/standalone/ChangesetReader.test.js

@@ -221,16 +221,15 @@ describe("ChangesetReader insert-full", () => {
         // Object.keys
         assert.deepEqual(Object.keys(modelNew).sort(), ["ECInstanceId", "ECClassId", "LastMod", "GeometryGuid", "$meta"].sort());
         // $meta keys
-        assert.deepEqual(Object.keys(modelNew.$meta).sort(), ["op", "tables", "changeIndexes", "stage", "instanceKey", "propFilter", "changeFetchedPropNames", "rowOptions", "isIndirectChange"].sort());
+        assert.deepEqual(Object.keys(modelNew.$meta).sort(), ["op", "tables", "changeIndexes", "stage", "instanceKey", "propFilter", "changeFetchedPropNames", "isIndirectChange"].sort());
         assert.equal(modelNew.$meta.op, "Updated");
         assert.equal(modelNew.$meta.stage, "New");
-        assert.deepEqual([...modelNew.$meta.tables].sort(), ["bis_Model"].sort());
-        assert.deepEqual([...modelNew.$meta.changeIndexes].sort(), [3].sort());
+        assert.deepEqual(modelNew.$meta.tables, ["bis_Model"]);
+        assert.deepEqual(modelNew.$meta.changeIndexes, [3]);
         assert.isString(modelNew.$meta.instanceKey);
         assert.equal(modelNew.$meta.instanceKey.split(`-`).length, 2);
         assert.equal(modelNew.$meta.propFilter, PropertyFilter.All);
-        assert.deepEqual([...modelNew.$meta.changeFetchedPropNames].sort(), ["ECInstanceId", "LastMod", "GeometryGuid"].sort());
-        assert.deepEqual(modelNew.$meta.rowOptions, {});
+        assert.deepEqual(modelNew.$meta.changeFetchedPropNames.sort(), ["ECInstanceId", "LastMod", "GeometryGuid"].sort());
         assert.equal(modelNew.$meta.isIndirectChange, true);
         // --- instances[1]: DrawingModel Updated Old ---
         const modelOld = instances.find((i) => i.ECInstanceId === drawingModelId && i.$meta.stage === "Old");
@@ -240,13 +239,12 @@ describe("ChangesetReader insert-full", () => {
         // Object.keys
         assert.deepEqual(Object.keys(modelOld).sort(), ["ECInstanceId", "ECClassId", "$meta"].sort());
         // $meta keys
-        assert.deepEqual(Object.keys(modelOld.$meta).sort(), ["op", "tables", "changeIndexes", "stage", "instanceKey", "propFilter", "changeFetchedPropNames", "rowOptions", "isIndirectChange"].sort());
+        assert.deepEqual(Object.keys(modelOld.$meta).sort(), ["op", "tables", "changeIndexes", "stage", "instanceKey", "propFilter", "changeFetchedPropNames", "isIndirectChange"].sort());
         assert.equal(modelOld.$meta.op, "Updated");
         assert.equal(modelOld.$meta.stage, "Old");
-        assert.deepEqual([...modelOld.$meta.tables].sort(), ["bis_Model"].sort());
+        assert.deepEqual(modelOld.$meta.tables, ["bis_Model"]);
         assert.equal(modelOld.$meta.propFilter, PropertyFilter.All);
-        assert.deepEqual([...modelOld.$meta.changeFetchedPropNames].sort(), ["ECInstanceId", "LastMod", "GeometryGuid"].sort());
-        assert.deepEqual(modelOld.$meta.rowOptions, {});
+        assert.deepEqual(modelOld.$meta.changeFetchedPropNames.sort(), ["ECInstanceId", "LastMod", "GeometryGuid"].sort());
         assert.equal(modelOld.$meta.isIndirectChange, true);
         // --- instances[2]: Test2dElement Inserted New ---
         const elem = instances.find((i) => i.ECInstanceId === fullElementId && i.$meta.stage === "New");
@@ -294,15 +292,15 @@ describe("ChangesetReader insert-full", () => {
             "Pt2dProp", "Pt3dProp", "StructProp", "IntArrProp", "StrArrProp", "StructArrProp", "RelatedElem", "BinProp"
         ].sort());
         // $meta keys
-        assert.deepEqual(Object.keys(elem.$meta).sort(), ["op", "tables", "changeIndexes", "stage", "instanceKey", "propFilter", "changeFetchedPropNames", "rowOptions", "isIndirectChange"].sort());
+        assert.deepEqual(Object.keys(elem.$meta).sort(), ["op", "tables", "changeIndexes", "stage", "instanceKey", "propFilter", "changeFetchedPropNames", "isIndirectChange"].sort());
         assert.equal(elem.$meta.op, "Inserted");
         assert.equal(elem.$meta.stage, "New");
-        assert.deepEqual([...elem.$meta.tables].sort(), ["bis_Element", "bis_GeometricElement2d"].sort());
-        assert.deepEqual([...elem.$meta.changeIndexes].sort(), [1, 2].sort());
+        assert.deepEqual(elem.$meta.tables.sort(), ["bis_Element", "bis_GeometricElement2d"].sort());
+        assert.deepEqual(elem.$meta.changeIndexes.sort(), [1, 2].sort());
         assert.isString(elem.$meta.instanceKey);
         assert.equal(elem.$meta.instanceKey.split(`-`).length, 2);
         assert.equal(elem.$meta.propFilter, PropertyFilter.All);
-        assert.deepEqual([...elem.$meta.changeFetchedPropNames].sort(), [
+        assert.deepEqual(elem.$meta.changeFetchedPropNames.sort(), [
             'BBoxHigh', 'BBoxLow', 'BinProp', 'BoolProp', 'Category.Id', 'CodeScope.Id',
             'CodeSpec.Id', 'CodeValue', 'DblProp', 'DtProp', 'ECClassId', 'ECInstanceId',
             'FederationGuid', 'GeometryStream', 'IntArrProp', 'IntProp', 'JsonProperties',
@@ -311,7 +309,6 @@ describe("ChangesetReader insert-full", () => {
             'StructProp.Pt2d', 'StructProp.Pt3d', 'StructProp.X', 'StructProp.Y', 'StructProp.Z',
             'TypeDefinition', 'UserLabel'
         ].sort());
-        assert.deepEqual(elem.$meta.rowOptions, {});
         assert.equal(elem.$meta.isIndirectChange, false);
     });
     it("txn1 insert-full | All_Properties | default rowOptions | invert", () => {
@@ -327,16 +324,15 @@ describe("ChangesetReader insert-full", () => {
         // Object.keys
         assert.deepEqual(Object.keys(modelNew).sort(), ["ECInstanceId", "ECClassId", "$meta"].sort());
         // $meta keys
-        assert.deepEqual(Object.keys(modelNew.$meta).sort(), ["op", "tables", "changeIndexes", "stage", "instanceKey", "propFilter", "changeFetchedPropNames", "rowOptions", "isIndirectChange"].sort());
+        assert.deepEqual(Object.keys(modelNew.$meta).sort(), ["op", "tables", "changeIndexes", "stage", "instanceKey", "propFilter", "changeFetchedPropNames", "isIndirectChange"].sort());
         assert.equal(modelNew.$meta.op, "Updated");
         assert.equal(modelNew.$meta.stage, "New");
-        assert.deepEqual([...modelNew.$meta.tables].sort(), ["bis_Model"].sort());
-        assert.deepEqual([...modelNew.$meta.changeIndexes].sort(), [3].sort());
+        assert.deepEqual(modelNew.$meta.tables, ["bis_Model"]);
+        assert.deepEqual(modelNew.$meta.changeIndexes, [3]);
         assert.isString(modelNew.$meta.instanceKey);
         assert.equal(modelNew.$meta.instanceKey.split(`-`).length, 2);
         assert.equal(modelNew.$meta.propFilter, PropertyFilter.All);
-        assert.deepEqual([...modelNew.$meta.changeFetchedPropNames].sort(), ["ECInstanceId", "LastMod", "GeometryGuid"].sort());
-        assert.deepEqual(modelNew.$meta.rowOptions, {});
+        assert.deepEqual(modelNew.$meta.changeFetchedPropNames.sort(), ["ECInstanceId", "LastMod", "GeometryGuid"].sort());
         assert.equal(modelNew.$meta.isIndirectChange, true);
         // --- instances[1]: DrawingModel Updated Old ---
         const modelOld = instances.find((i) => i.ECInstanceId === drawingModelId && i.$meta.stage === "Old");
@@ -348,13 +344,12 @@ describe("ChangesetReader insert-full", () => {
         // Object.keys
         assert.deepEqual(Object.keys(modelOld).sort(), ["ECInstanceId", "ECClassId", "$meta", "LastMod", "GeometryGuid"].sort());
         // $meta keys
-        assert.deepEqual(Object.keys(modelOld.$meta).sort(), ["op", "tables", "changeIndexes", "stage", "instanceKey", "propFilter", "changeFetchedPropNames", "rowOptions", "isIndirectChange"].sort());
+        assert.deepEqual(Object.keys(modelOld.$meta).sort(), ["op", "tables", "changeIndexes", "stage", "instanceKey", "propFilter", "changeFetchedPropNames", "isIndirectChange"].sort());
         assert.equal(modelOld.$meta.op, "Updated");
         assert.equal(modelOld.$meta.stage, "Old");
-        assert.deepEqual([...modelOld.$meta.tables].sort(), ["bis_Model"].sort());
+        assert.deepEqual(modelOld.$meta.tables, ["bis_Model"]);
         assert.equal(modelOld.$meta.propFilter, PropertyFilter.All);
-        assert.deepEqual([...modelOld.$meta.changeFetchedPropNames].sort(), ["ECInstanceId", "LastMod", "GeometryGuid"].sort());
-        assert.deepEqual(modelOld.$meta.rowOptions, {});
+        assert.deepEqual(modelOld.$meta.changeFetchedPropNames.sort(), ["ECInstanceId", "LastMod", "GeometryGuid"].sort());
         assert.equal(modelOld.$meta.isIndirectChange, true);
         // --- instances[2]: Test2dElement Inserted New ---
         const elem = instances.find((i) => i.ECInstanceId === fullElementId && i.$meta.stage === "Old");
@@ -402,15 +397,15 @@ describe("ChangesetReader insert-full", () => {
             "Pt2dProp", "Pt3dProp", "StructProp", "IntArrProp", "StrArrProp", "StructArrProp", "RelatedElem", "BinProp"
         ].sort());
         // $meta keys
-        assert.deepEqual(Object.keys(elem.$meta).sort(), ["op", "tables", "changeIndexes", "stage", "instanceKey", "propFilter", "changeFetchedPropNames", "rowOptions", "isIndirectChange"].sort());
+        assert.deepEqual(Object.keys(elem.$meta).sort(), ["op", "tables", "changeIndexes", "stage", "instanceKey", "propFilter", "changeFetchedPropNames", "isIndirectChange"].sort());
         assert.equal(elem.$meta.op, "Deleted");
         assert.equal(elem.$meta.stage, "Old");
-        assert.deepEqual([...elem.$meta.tables].sort(), ["bis_Element", "bis_GeometricElement2d"].sort());
-        assert.deepEqual([...elem.$meta.changeIndexes].sort(), [1, 2].sort());
+        assert.deepEqual(elem.$meta.tables.sort(), ["bis_Element", "bis_GeometricElement2d"].sort());
+        assert.deepEqual(elem.$meta.changeIndexes.sort(), [1, 2].sort());
         assert.isString(elem.$meta.instanceKey);
         assert.equal(elem.$meta.instanceKey.split(`-`).length, 2);
         assert.equal(elem.$meta.propFilter, PropertyFilter.All);
-        assert.deepEqual([...elem.$meta.changeFetchedPropNames].sort(), [
+        assert.deepEqual(elem.$meta.changeFetchedPropNames.sort(), [
             'BBoxHigh', 'BBoxLow', 'BinProp', 'BoolProp', 'Category.Id', 'CodeScope.Id',
             'CodeSpec.Id', 'CodeValue', 'DblProp', 'DtProp', 'ECClassId', 'ECInstanceId',
             'FederationGuid', 'GeometryStream', 'IntArrProp', 'IntProp', 'JsonProperties',
@@ -419,7 +414,6 @@ describe("ChangesetReader insert-full", () => {
             'StructProp.Pt2d', 'StructProp.Pt3d', 'StructProp.X', 'StructProp.Y', 'StructProp.Z',
             'TypeDefinition', 'UserLabel'
         ].sort());
-        assert.deepEqual(elem.$meta.rowOptions, {});
         assert.equal(elem.$meta.isIndirectChange, false);
     });
     it("txn1 insert-full | Bis_Element_Properties", () => {
@@ -437,7 +431,7 @@ describe("ChangesetReader insert-full", () => {
         assert.equal(modelNew.$meta.op, "Updated");
         assert.equal(modelNew.$meta.stage, "New");
         assert.equal(modelNew.$meta.propFilter, PropertyFilter.BisCoreElement);
-        assert.deepEqual([...modelNew.$meta.changeFetchedPropNames].sort(), ["ECInstanceId", "LastMod", "GeometryGuid"].sort());
+        assert.deepEqual(modelNew.$meta.changeFetchedPropNames.sort(), ["ECInstanceId", "LastMod", "GeometryGuid"].sort());
         assert.deepEqual(modelNew.$meta.rowOptions, { classIdsToClassNames: true });
         assert.equal(modelNew.$meta.isIndirectChange, true);
         // --- instances[1]: DrawingModel Updated Old ---
@@ -450,7 +444,7 @@ describe("ChangesetReader insert-full", () => {
         assert.equal(modelOld.$meta.op, "Updated");
         assert.equal(modelOld.$meta.stage, "Old");
         assert.equal(modelOld.$meta.propFilter, PropertyFilter.BisCoreElement);
-        assert.deepEqual([...modelOld.$meta.changeFetchedPropNames].sort(), ["ECInstanceId", "LastMod", "GeometryGuid"].sort());
+        assert.deepEqual(modelOld.$meta.changeFetchedPropNames.sort(), ["ECInstanceId", "LastMod", "GeometryGuid"].sort());
         assert.deepEqual(modelOld.$meta.rowOptions, { classIdsToClassNames: true });
         assert.equal(modelOld.$meta.isIndirectChange, true);
         // --- instances[2]: Test2dElement Inserted New (Bis_Element_Properties: no custom props) ---
@@ -481,12 +475,12 @@ describe("ChangesetReader insert-full", () => {
         assert.deepEqual(Object.keys(elem.$meta).sort(), ["op", "tables", "changeIndexes", "stage", "instanceKey", "propFilter", "changeFetchedPropNames", "rowOptions", "isIndirectChange"].sort());
         assert.equal(elem.$meta.op, "Inserted");
         assert.equal(elem.$meta.stage, "New");
-        assert.deepEqual([...elem.$meta.tables].sort(), ["bis_Element", "bis_GeometricElement2d"].sort());
-        assert.deepEqual([...elem.$meta.changeIndexes].sort(), [1, 2].sort());
+        assert.deepEqual(elem.$meta.tables.sort(), ["bis_Element", "bis_GeometricElement2d"].sort());
+        assert.deepEqual(elem.$meta.changeIndexes.sort(), [1, 2].sort());
         assert.isString(elem.$meta.instanceKey);
         assert.equal(elem.$meta.instanceKey.split(`-`).length, 2);
         assert.equal(elem.$meta.propFilter, PropertyFilter.BisCoreElement);
-        assert.deepEqual([...elem.$meta.changeFetchedPropNames].sort(), ["ECInstanceId", "ECClassId", "CodeScope.Id", "CodeSpec.Id",
+        assert.deepEqual(elem.$meta.changeFetchedPropNames.sort(), ["ECInstanceId", "ECClassId", "CodeScope.Id", "CodeSpec.Id",
             "CodeValue", "FederationGuid", "JsonProperties", "LastMod", "Model.Id", "Parent", "UserLabel"].sort());
         assert.deepEqual(elem.$meta.rowOptions, { classIdsToClassNames: true });
         assert.equal(elem.$meta.isIndirectChange, false);
@@ -500,16 +494,15 @@ describe("ChangesetReader insert-full", () => {
         assert.equal(modelNew.ECInstanceId, drawingModelId);
         assert.equal("BisCore:DrawingModel", rwIModel.getClassNameFromId(modelNew.ECClassId));
         assert.deepEqual(Object.keys(modelNew).sort(), ["ECInstanceId", "ECClassId", "$meta"].sort());
-        assert.deepEqual(Object.keys(modelNew.$meta).sort(), ["op", "tables", "changeIndexes", "stage", "instanceKey", "propFilter", "changeFetchedPropNames", "rowOptions", "isIndirectChange"].sort());
+        assert.deepEqual(Object.keys(modelNew.$meta).sort(), ["op", "tables", "changeIndexes", "stage", "instanceKey", "propFilter", "changeFetchedPropNames", "isIndirectChange"].sort());
         assert.equal(modelNew.$meta.op, "Updated");
         assert.equal(modelNew.$meta.stage, "New");
-        assert.deepEqual([...modelNew.$meta.tables].sort(), ["bis_Model"].sort());
-        assert.deepEqual([...modelNew.$meta.changeIndexes].sort(), [3].sort());
+        assert.deepEqual(modelNew.$meta.tables, ["bis_Model"]);
+        assert.deepEqual(modelNew.$meta.changeIndexes, [3]);
         assert.isString(modelNew.$meta.instanceKey);
         assert.equal(modelNew.$meta.instanceKey.split(`-`).length, 2);
         assert.equal(modelNew.$meta.propFilter, PropertyFilter.InstanceKey);
-        assert.deepEqual([...modelNew.$meta.changeFetchedPropNames].sort(), ["ECInstanceId"].sort());
-        assert.deepEqual(modelNew.$meta.rowOptions, {});
+        assert.deepEqual(modelNew.$meta.changeFetchedPropNames, ["ECInstanceId"]);
         assert.equal(modelNew.$meta.isIndirectChange, true);
         // --- instances[1]: DrawingModel Updated Old ---
         const modelOld = instances.find((i) => i.ECInstanceId === drawingModelId && i.$meta.stage === "Old");
@@ -517,12 +510,11 @@ describe("ChangesetReader insert-full", () => {
         assert.equal(modelOld.ECInstanceId, drawingModelId);
         assert.equal("BisCore:DrawingModel", rwIModel.getClassNameFromId(modelOld.ECClassId));
         assert.deepEqual(Object.keys(modelOld).sort(), ["ECInstanceId", "ECClassId", "$meta"].sort());
-        assert.deepEqual(Object.keys(modelOld.$meta).sort(), ["op", "tables", "changeIndexes", "stage", "instanceKey", "propFilter", "changeFetchedPropNames", "rowOptions", "isIndirectChange"].sort());
+        assert.deepEqual(Object.keys(modelOld.$meta).sort(), ["op", "tables", "changeIndexes", "stage", "instanceKey", "propFilter", "changeFetchedPropNames", "isIndirectChange"].sort());
         assert.equal(modelOld.$meta.op, "Updated");
         assert.equal(modelOld.$meta.stage, "Old");
         assert.equal(modelOld.$meta.propFilter, PropertyFilter.InstanceKey);
-        assert.deepEqual([...modelOld.$meta.changeFetchedPropNames].sort(), ["ECInstanceId"].sort());
-        assert.deepEqual(modelOld.$meta.rowOptions, {});
+        assert.deepEqual(modelOld.$meta.changeFetchedPropNames, ["ECInstanceId"]);
         assert.equal(modelOld.$meta.isIndirectChange, true);
         // --- instances[2]: Test2dElement Inserted New (only ECInstanceId + ECClassId) ---
         const elem = instances.find((i) => i.ECInstanceId === fullElementId && i.$meta.stage === "New");
@@ -534,16 +526,15 @@ describe("ChangesetReader insert-full", () => {
         assert.isUndefined(elem.Category);
         assert.isUndefined(elem.LastMod);
         assert.deepEqual(Object.keys(elem).sort(), ["ECInstanceId", "ECClassId", "$meta"].sort());
-        assert.deepEqual(Object.keys(elem.$meta).sort(), ["op", "tables", "changeIndexes", "stage", "instanceKey", "propFilter", "changeFetchedPropNames", "rowOptions", "isIndirectChange"].sort());
+        assert.deepEqual(Object.keys(elem.$meta).sort(), ["op", "tables", "changeIndexes", "stage", "instanceKey", "propFilter", "changeFetchedPropNames", "isIndirectChange"].sort());
         assert.equal(elem.$meta.op, "Inserted");
         assert.equal(elem.$meta.stage, "New");
-        assert.deepEqual([...elem.$meta.tables].sort(), ["bis_Element", "bis_GeometricElement2d"].sort());
-        assert.deepEqual([...elem.$meta.changeIndexes].sort(), [1, 2].sort());
+        assert.deepEqual(elem.$meta.tables.sort(), ["bis_Element", "bis_GeometricElement2d"].sort());
+        assert.deepEqual(elem.$meta.changeIndexes.sort(), [1, 2].sort());
         assert.isString(elem.$meta.instanceKey);
         assert.equal(elem.$meta.instanceKey.split(`-`).length, 2);
         assert.equal(elem.$meta.propFilter, PropertyFilter.InstanceKey);
-        assert.deepEqual([...elem.$meta.changeFetchedPropNames].sort(), ["ECInstanceId", "ECClassId"].sort());
-        assert.deepEqual(elem.$meta.rowOptions, {});
+        assert.deepEqual(elem.$meta.changeFetchedPropNames.sort(), ["ECInstanceId", "ECClassId"].sort());
         assert.equal(elem.$meta.isIndirectChange, false);
     });
     it("txn1 | rowOptions: classIdsToClassNames", () => {
@@ -561,7 +552,7 @@ describe("ChangesetReader insert-full", () => {
         assert.equal(modelNew.$meta.op, "Updated");
         assert.equal(modelNew.$meta.stage, "New");
         assert.equal(modelNew.$meta.propFilter, PropertyFilter.All);
-        assert.deepEqual([...modelNew.$meta.changeFetchedPropNames].sort(), ["ECInstanceId", "LastMod", "GeometryGuid"].sort());
+        assert.deepEqual(modelNew.$meta.changeFetchedPropNames.sort(), ["ECInstanceId", "LastMod", "GeometryGuid"].sort());
         assert.deepEqual(modelNew.$meta.rowOptions, { classIdsToClassNames: true });
         assert.equal(modelNew.$meta.isIndirectChange, true);
         // --- instances[1]: DrawingModel Updated Old ---
@@ -574,7 +565,7 @@ describe("ChangesetReader insert-full", () => {
         assert.equal(modelOld.$meta.op, "Updated");
         assert.equal(modelOld.$meta.stage, "Old");
         assert.equal(modelOld.$meta.propFilter, PropertyFilter.All);
-        assert.deepEqual([...modelOld.$meta.changeFetchedPropNames].sort(), ["ECInstanceId", "LastMod", "GeometryGuid"].sort());
+        assert.deepEqual(modelOld.$meta.changeFetchedPropNames.sort(), ["ECInstanceId", "LastMod", "GeometryGuid"].sort());
         assert.deepEqual(modelOld.$meta.rowOptions, { classIdsToClassNames: true });
         assert.equal(modelOld.$meta.isIndirectChange, true);
         // --- instances[2]: Test2dElement Inserted New (ECClassId + all RelECClassId = class names) ---
@@ -618,7 +609,7 @@ describe("ChangesetReader insert-full", () => {
         assert.equal(elem.$meta.stage, "New");
         assert.equal(elem.$meta.propFilter, PropertyFilter.All);
         assert.deepEqual(elem.$meta.rowOptions, { classIdsToClassNames: true });
-        assert.deepEqual([...elem.$meta.changeFetchedPropNames].sort(), ["ECInstanceId", "ECClassId", "Model.Id", "LastMod", "CodeSpec.Id", "CodeScope.Id",
+        assert.deepEqual(elem.$meta.changeFetchedPropNames.sort(), ["ECInstanceId", "ECClassId", "Model.Id", "LastMod", "CodeSpec.Id", "CodeScope.Id",
             "CodeValue", "UserLabel", "Parent", "FederationGuid", "JsonProperties", "Category.Id",
             "Origin", "Rotation", "BBoxLow", "BBoxHigh", "GeometryStream", "TypeDefinition", "StrProp",
             "IntProp", "LongProp", "DblProp", "BoolProp", "DtProp", "BinProp", "Pt2dProp", "Pt3dProp",
@@ -643,7 +634,7 @@ describe("ChangesetReader insert-full", () => {
         assert.equal(modelNew.$meta.op, "Updated");
         assert.equal(modelNew.$meta.stage, "New");
         assert.equal(modelNew.$meta.propFilter, PropertyFilter.All);
-        assert.deepEqual([...modelNew.$meta.changeFetchedPropNames].sort(), ["ECInstanceId", "LastMod", "GeometryGuid"].sort());
+        assert.deepEqual(modelNew.$meta.changeFetchedPropNames.sort(), ["ECInstanceId", "LastMod", "GeometryGuid"].sort());
         assert.deepEqual(modelNew.$meta.rowOptions, { useJsName: true });
         assert.equal(modelNew.$meta.isIndirectChange, true);
         // --- instances[1]: DrawingModel Updated Old ---
@@ -657,7 +648,7 @@ describe("ChangesetReader insert-full", () => {
         assert.equal(modelOld.$meta.op, "Updated");
         assert.equal(modelOld.$meta.stage, "Old");
         assert.equal(modelOld.$meta.propFilter, PropertyFilter.All);
-        assert.deepEqual([...modelOld.$meta.changeFetchedPropNames].sort(), ["ECInstanceId", "LastMod", "GeometryGuid"].sort());
+        assert.deepEqual(modelOld.$meta.changeFetchedPropNames.sort(), ["ECInstanceId", "LastMod", "GeometryGuid"].sort());
         assert.deepEqual(modelOld.$meta.rowOptions, { useJsName: true });
         assert.equal(modelOld.$meta.isIndirectChange, true);
         // --- instances[2]: Test2dElement Inserted New (camelCase keys + class names for nav) ---
@@ -704,7 +695,7 @@ describe("ChangesetReader insert-full", () => {
         assert.equal(elem.$meta.op, "Inserted");
         assert.equal(elem.$meta.stage, "New");
         assert.equal(elem.$meta.propFilter, PropertyFilter.All);
-        assert.deepEqual([...elem.$meta.changeFetchedPropNames].sort(), [
+        assert.deepEqual(elem.$meta.changeFetchedPropNames.sort(), [
             'BBoxHigh', 'BBoxLow', 'BinProp', 'BoolProp', 'Category.Id', 'CodeScope.Id',
             'CodeSpec.Id', 'CodeValue', 'DblProp', 'DtProp', 'ECClassId',
             'ECInstanceId', 'FederationGuid', 'GeometryStream', 'IntArrProp', 'IntProp',
@@ -731,7 +722,7 @@ describe("ChangesetReader insert-full", () => {
         assert.equal(modelNew.$meta.op, "Updated");
         assert.equal(modelNew.$meta.stage, "New");
         assert.equal(modelNew.$meta.propFilter, PropertyFilter.All);
-        assert.deepEqual([...modelNew.$meta.changeFetchedPropNames].sort(), ["ECInstanceId", "LastMod", "GeometryGuid"].sort());
+        assert.deepEqual(modelNew.$meta.changeFetchedPropNames.sort(), ["ECInstanceId", "LastMod", "GeometryGuid"].sort());
         assert.deepEqual(modelNew.$meta.rowOptions, { abbreviateBlobs: true });
         assert.equal(modelNew.$meta.isIndirectChange, true);
         // --- instances[1]: DrawingModel Updated Old ---
@@ -744,7 +735,7 @@ describe("ChangesetReader insert-full", () => {
         assert.equal(modelOld.$meta.op, "Updated");
         assert.equal(modelOld.$meta.stage, "Old");
         assert.equal(modelOld.$meta.propFilter, PropertyFilter.All);
-        assert.deepEqual([...modelOld.$meta.changeFetchedPropNames].sort(), ["ECInstanceId", "LastMod", "GeometryGuid"].sort());
+        assert.deepEqual(modelOld.$meta.changeFetchedPropNames.sort(), ["ECInstanceId", "LastMod", "GeometryGuid"].sort());
         assert.deepEqual(modelOld.$meta.rowOptions, { abbreviateBlobs: true });
         assert.equal(modelOld.$meta.isIndirectChange, true);
         // --- instances[2]: Test2dElement Inserted New ---
@@ -811,7 +802,7 @@ describe("ChangesetReader insert-full", () => {
         assert.equal(modelNew.$meta.op, "Updated");
         assert.equal(modelNew.$meta.stage, "New");
         assert.equal(modelNew.$meta.propFilter, PropertyFilter.All);
-        assert.deepEqual([...modelNew.$meta.changeFetchedPropNames].sort(), ["ECInstanceId", "LastMod", "GeometryGuid"].sort());
+        assert.deepEqual(modelNew.$meta.changeFetchedPropNames.sort(), ["ECInstanceId", "LastMod", "GeometryGuid"].sort());
         assert.deepEqual(modelNew.$meta.rowOptions, { abbreviateBlobs: false });
         assert.equal(modelNew.$meta.isIndirectChange, true);
         // --- instances[1]: DrawingModel Updated Old ---
@@ -824,7 +815,7 @@ describe("ChangesetReader insert-full", () => {
         assert.equal(modelOld.$meta.op, "Updated");
         assert.equal(modelOld.$meta.stage, "Old");
         assert.equal(modelOld.$meta.propFilter, PropertyFilter.All);
-        assert.deepEqual([...modelOld.$meta.changeFetchedPropNames].sort(), ["ECInstanceId", "LastMod", "GeometryGuid"].sort());
+        assert.deepEqual(modelOld.$meta.changeFetchedPropNames.sort(), ["ECInstanceId", "LastMod", "GeometryGuid"].sort());
         assert.deepEqual(modelOld.$meta.rowOptions, { abbreviateBlobs: false });
         assert.equal(modelOld.$meta.isIndirectChange, true);
         // --- instances[2]: Test2dElement Inserted New ---
@@ -917,7 +908,7 @@ describe("ChangesetReader insert-full", () => {
         assert.equal(modelNew.$meta.op, "Updated");
         assert.equal(modelNew.$meta.stage, "New");
         assert.equal(modelNew.$meta.propFilter, PropertyFilter.All);
-        assert.deepEqual([...modelNew.$meta.changeFetchedPropNames].sort(), ["ECInstanceId", "LastMod", "GeometryGuid"].sort());
+        assert.deepEqual(modelNew.$meta.changeFetchedPropNames.sort(), ["ECInstanceId", "LastMod", "GeometryGuid"].sort());
         assert.deepEqual(modelNew.$meta.rowOptions, { classIdsToClassNames: true, useJsName: true });
         assert.equal(modelNew.$meta.isIndirectChange, true);
         // --- instances[1]: DrawingModel Updated Old ---
@@ -931,7 +922,7 @@ describe("ChangesetReader insert-full", () => {
         assert.equal(modelOld.$meta.op, "Updated");
         assert.equal(modelOld.$meta.stage, "Old");
         assert.equal(modelOld.$meta.propFilter, PropertyFilter.All);
-        assert.deepEqual([...modelOld.$meta.changeFetchedPropNames].sort(), ["ECInstanceId", "LastMod", "GeometryGuid"].sort());
+        assert.deepEqual(modelOld.$meta.changeFetchedPropNames.sort(), ["ECInstanceId", "LastMod", "GeometryGuid"].sort());
         assert.deepEqual(modelOld.$meta.rowOptions, { classIdsToClassNames: true, useJsName: true });
         assert.equal(modelOld.$meta.isIndirectChange, true);
         // --- instances[2]: Test2dElement Inserted New (camelCase + class names) ---
@@ -977,7 +968,7 @@ describe("ChangesetReader insert-full", () => {
         assert.equal(elem.$meta.op, "Inserted");
         assert.equal(elem.$meta.stage, "New");
         assert.equal(elem.$meta.propFilter, PropertyFilter.All);
-        assert.deepEqual([...elem.$meta.changeFetchedPropNames].sort(), [
+        assert.deepEqual(elem.$meta.changeFetchedPropNames.sort(), [
             'BBoxHigh', 'BBoxLow', 'BinProp', 'BoolProp', 'Category.Id',
             'CodeScope.Id', 'CodeSpec.Id',
             'CodeValue', 'DblProp', 'DtProp',
@@ -1011,12 +1002,12 @@ describe("ChangesetReader insert-full", () => {
         assert.deepEqual(Object.keys(inMemoryModelNew.$meta).sort(), Object.keys(sqliteBackedModelNew.$meta).sort());
         assert.equal(inMemoryModelNew.$meta.op, sqliteBackedModelNew.$meta.op);
         assert.equal(inMemoryModelNew.$meta.stage, sqliteBackedModelNew.$meta.stage);
-        assert.deepEqual([...inMemoryModelNew.$meta.tables].sort(), [...sqliteBackedModelNew.$meta.tables].sort());
-        assert.deepEqual([...inMemoryModelNew.$meta.changeIndexes].sort(), [...sqliteBackedModelNew.$meta.changeIndexes].sort());
+        assert.deepEqual(inMemoryModelNew.$meta.tables.sort(), sqliteBackedModelNew.$meta.tables.sort());
+        assert.deepEqual(inMemoryModelNew.$meta.changeIndexes.sort(), sqliteBackedModelNew.$meta.changeIndexes.sort());
         assert.isString(inMemoryModelNew.$meta.instanceKey);
         assert.equal(inMemoryModelNew.$meta.instanceKey.split(`-`).length, 2);
         assert.equal(inMemoryModelNew.$meta.propFilter, sqliteBackedModelNew.$meta.propFilter);
-        assert.deepEqual([...inMemoryModelNew.$meta.changeFetchedPropNames].sort(), [...sqliteBackedModelNew.$meta.changeFetchedPropNames].sort());
+        assert.deepEqual(inMemoryModelNew.$meta.changeFetchedPropNames.sort(), sqliteBackedModelNew.$meta.changeFetchedPropNames.sort());
         assert.deepEqual(inMemoryModelNew.$meta.rowOptions, sqliteBackedModelNew.$meta.rowOptions);
         assert.equal(inMemoryModelNew.$meta.isIndirectChange, sqliteBackedModelNew.$meta.isIndirectChange);
         // --- instances[1]: DrawingModel Updated Old ---
@@ -1032,9 +1023,9 @@ describe("ChangesetReader insert-full", () => {
         assert.deepEqual(Object.keys(inMemoryModelOld.$meta).sort(), Object.keys(sqliteBackedModelOld.$meta).sort());
         assert.equal(inMemoryModelOld.$meta.op, sqliteBackedModelOld.$meta.op);
         assert.equal(inMemoryModelOld.$meta.stage, sqliteBackedModelOld.$meta.stage);
-        assert.deepEqual([...inMemoryModelOld.$meta.tables].sort(), [...sqliteBackedModelOld.$meta.tables].sort());
+        assert.deepEqual(inMemoryModelOld.$meta.tables.sort(), sqliteBackedModelOld.$meta.tables.sort());
         assert.equal(inMemoryModelOld.$meta.propFilter, sqliteBackedModelOld.$meta.propFilter);
-        assert.deepEqual([...inMemoryModelOld.$meta.changeFetchedPropNames].sort(), [...sqliteBackedModelOld.$meta.changeFetchedPropNames].sort());
+        assert.deepEqual(inMemoryModelOld.$meta.changeFetchedPropNames.sort(), sqliteBackedModelOld.$meta.changeFetchedPropNames.sort());
         assert.deepEqual(inMemoryModelOld.$meta.rowOptions, sqliteBackedModelOld.$meta.rowOptions);
         assert.equal(inMemoryModelOld.$meta.isIndirectChange, sqliteBackedModelOld.$meta.isIndirectChange);
         // --- instances[2]: Test2dElement Inserted New ---
@@ -1080,10 +1071,10 @@ describe("ChangesetReader insert-full", () => {
         assert.deepEqual(Object.keys(inMemoryElem.$meta).sort(), Object.keys(sqliteBackedElem.$meta).sort());
         assert.equal(inMemoryElem.$meta.op, sqliteBackedElem.$meta.op);
         assert.equal(inMemoryElem.$meta.stage, sqliteBackedElem.$meta.stage);
-        assert.deepEqual([...inMemoryElem.$meta.tables].sort(), [...sqliteBackedElem.$meta.tables].sort());
-        assert.deepEqual([...inMemoryElem.$meta.changeIndexes].sort(), [...sqliteBackedElem.$meta.changeIndexes].sort());
+        assert.deepEqual(inMemoryElem.$meta.tables.sort(), sqliteBackedElem.$meta.tables.sort());
+        assert.deepEqual(inMemoryElem.$meta.changeIndexes.sort(), sqliteBackedElem.$meta.changeIndexes.sort());
         assert.equal(inMemoryElem.$meta.instanceKey, sqliteBackedElem.$meta.instanceKey);
-        assert.deepEqual([...inMemoryElem.$meta.changeFetchedPropNames].sort(), [...sqliteBackedElem.$meta.changeFetchedPropNames].sort());
+        assert.deepEqual(inMemoryElem.$meta.changeFetchedPropNames.sort(), sqliteBackedElem.$meta.changeFetchedPropNames.sort());
         assert.deepEqual(inMemoryElem.$meta.rowOptions, sqliteBackedElem.$meta.rowOptions);
         assert.equal(inMemoryElem.$meta.isIndirectChange, sqliteBackedElem.$meta.isIndirectChange);
     });
@@ -1258,12 +1249,11 @@ describe("ChangesetReader insert-partial", () => {
         assert.isString(modelNew.LastMod);
         assert.isString(modelNew.GeometryGuid);
         assert.deepEqual(Object.keys(modelNew).sort(), ["ECInstanceId", "ECClassId", "LastMod", "GeometryGuid", "$meta"].sort());
-        assert.deepEqual(Object.keys(modelNew.$meta).sort(), ["op", "tables", "changeIndexes", "stage", "instanceKey", "propFilter", "changeFetchedPropNames", "rowOptions", "isIndirectChange"].sort());
+        assert.deepEqual(Object.keys(modelNew.$meta).sort(), ["op", "tables", "changeIndexes", "stage", "instanceKey", "propFilter", "changeFetchedPropNames", "isIndirectChange"].sort());
         assert.equal(modelNew.$meta.op, "Updated");
         assert.equal(modelNew.$meta.stage, "New");
         assert.equal(modelNew.$meta.propFilter, PropertyFilter.All);
-        assert.deepEqual([...modelNew.$meta.changeFetchedPropNames].sort(), ["ECInstanceId", "LastMod", "GeometryGuid"].sort());
-        assert.deepEqual(modelNew.$meta.rowOptions, {});
+        assert.deepEqual(modelNew.$meta.changeFetchedPropNames.sort(), ["ECInstanceId", "LastMod", "GeometryGuid"].sort());
         assert.equal(modelNew.$meta.isIndirectChange, true);
         // --- instances[1]: DrawingModel Updated Old ---
         const modelOld = instances.find((i) => i.ECInstanceId === drawingModelId && i.$meta.stage === "Old");
@@ -1272,12 +1262,11 @@ describe("ChangesetReader insert-partial", () => {
         assert.equal("BisCore:DrawingModel", rwIModel.getClassNameFromId(modelOld.ECClassId));
         // Model Old has LastMod and GeometryGuid when previous txn's model New values survive
         assert.deepEqual(Object.keys(modelOld).sort(), ["ECInstanceId", "ECClassId", "$meta"].sort());
-        assert.deepEqual(Object.keys(modelOld.$meta).sort(), ["op", "tables", "changeIndexes", "stage", "instanceKey", "propFilter", "changeFetchedPropNames", "rowOptions", "isIndirectChange"].sort());
+        assert.deepEqual(Object.keys(modelOld.$meta).sort(), ["op", "tables", "changeIndexes", "stage", "instanceKey", "propFilter", "changeFetchedPropNames", "isIndirectChange"].sort());
         assert.equal(modelOld.$meta.op, "Updated");
         assert.equal(modelOld.$meta.stage, "Old");
         assert.equal(modelOld.$meta.propFilter, PropertyFilter.All);
-        assert.deepEqual([...modelOld.$meta.changeFetchedPropNames].sort(), ["ECInstanceId", "LastMod", "GeometryGuid"].sort());
-        assert.deepEqual(modelOld.$meta.rowOptions, {});
+        assert.deepEqual(modelOld.$meta.changeFetchedPropNames.sort(), ["ECInstanceId", "LastMod", "GeometryGuid"].sort());
         assert.equal(modelOld.$meta.isIndirectChange, true);
         // --- instances[2]: Test2dElement (partial) Inserted New ---
         const elem = instances.find((i) => i.ECInstanceId === partialElementId && i.$meta.stage === "New");
@@ -1315,15 +1304,15 @@ describe("ChangesetReader insert-partial", () => {
             "Category",
         ].sort());
         // $meta keys
-        assert.deepEqual(Object.keys(elem.$meta).sort(), ["op", "tables", "changeIndexes", "stage", "instanceKey", "propFilter", "changeFetchedPropNames", "rowOptions", "isIndirectChange"].sort());
+        assert.deepEqual(Object.keys(elem.$meta).sort(), ["op", "tables", "changeIndexes", "stage", "instanceKey", "propFilter", "changeFetchedPropNames", "isIndirectChange"].sort());
         assert.equal(elem.$meta.op, "Inserted");
         assert.equal(elem.$meta.stage, "New");
-        assert.deepEqual([...elem.$meta.tables].sort(), ["bis_Element", "bis_GeometricElement2d"].sort());
-        assert.deepEqual([...elem.$meta.changeIndexes].sort(), [1, 2].sort());
+        assert.deepEqual(elem.$meta.tables.sort(), ["bis_Element", "bis_GeometricElement2d"].sort());
+        assert.deepEqual(elem.$meta.changeIndexes.sort(), [1, 2].sort());
         assert.isString(elem.$meta.instanceKey);
         assert.equal(elem.$meta.instanceKey.split(`-`).length, 2);
         assert.equal(elem.$meta.propFilter, PropertyFilter.All);
-        assert.deepEqual([...elem.$meta.changeFetchedPropNames].sort(), [
+        assert.deepEqual(elem.$meta.changeFetchedPropNames.sort(), [
             'ECInstanceId', 'ECClassId', 'Model.Id', 'LastMod', 'CodeSpec.Id',
             'CodeScope.Id', 'CodeValue', 'UserLabel', 'Parent', 'FederationGuid',
             'JsonProperties', 'Category.Id', 'Origin', 'Rotation', 'BBoxLow', 'BBoxHigh',
@@ -1333,7 +1322,6 @@ describe("ChangesetReader insert-partial", () => {
             'StructProp.Pt2d', 'StructProp.Pt3d', 'IntArrProp', 'StrArrProp',
             'StructArrProp', 'RelatedElem'
         ].sort());
-        assert.deepEqual(elem.$meta.rowOptions, {});
         assert.isUndefined(elem.BinProp);
         assert.equal(elem.$meta.isIndirectChange, false);
     });
@@ -1348,12 +1336,11 @@ describe("ChangesetReader insert-partial", () => {
         assert.isUndefined(modelNew.LastMod);
         assert.isUndefined(modelNew.GeometryGuid);
         assert.deepEqual(Object.keys(modelNew).sort(), ["ECInstanceId", "ECClassId", "$meta"].sort());
-        assert.deepEqual(Object.keys(modelNew.$meta).sort(), ["op", "tables", "changeIndexes", "stage", "instanceKey", "propFilter", "changeFetchedPropNames", "rowOptions", "isIndirectChange"].sort());
+        assert.deepEqual(Object.keys(modelNew.$meta).sort(), ["op", "tables", "changeIndexes", "stage", "instanceKey", "propFilter", "changeFetchedPropNames", "isIndirectChange"].sort());
         assert.equal(modelNew.$meta.op, "Updated");
         assert.equal(modelNew.$meta.stage, "New");
         assert.equal(modelNew.$meta.propFilter, PropertyFilter.All);
-        assert.deepEqual([...modelNew.$meta.changeFetchedPropNames].sort(), ["ECInstanceId", "LastMod", "GeometryGuid"].sort());
-        assert.deepEqual(modelNew.$meta.rowOptions, {});
+        assert.deepEqual(modelNew.$meta.changeFetchedPropNames.sort(), ["ECInstanceId", "LastMod", "GeometryGuid"].sort());
         assert.equal(modelNew.$meta.isIndirectChange, true);
         // --- instances[1]: DrawingModel Updated Old ---
         const modelOld = instances.find((i) => i.ECInstanceId === drawingModelId && i.$meta.stage === "Old");
@@ -1364,12 +1351,11 @@ describe("ChangesetReader insert-partial", () => {
         assert.isString(modelOld.GeometryGuid);
         // Model Old has LastMod and GeometryGuid when previous txn's model New values survive
         assert.deepEqual(Object.keys(modelOld).sort(), ["ECInstanceId", "ECClassId", "$meta", "LastMod", "GeometryGuid"].sort());
-        assert.deepEqual(Object.keys(modelOld.$meta).sort(), ["op", "tables", "changeIndexes", "stage", "instanceKey", "propFilter", "changeFetchedPropNames", "rowOptions", "isIndirectChange"].sort());
+        assert.deepEqual(Object.keys(modelOld.$meta).sort(), ["op", "tables", "changeIndexes", "stage", "instanceKey", "propFilter", "changeFetchedPropNames", "isIndirectChange"].sort());
         assert.equal(modelOld.$meta.op, "Updated");
         assert.equal(modelOld.$meta.stage, "Old");
         assert.equal(modelOld.$meta.propFilter, PropertyFilter.All);
-        assert.deepEqual([...modelOld.$meta.changeFetchedPropNames].sort(), ["ECInstanceId", "LastMod", "GeometryGuid"].sort());
-        assert.deepEqual(modelOld.$meta.rowOptions, {});
+        assert.deepEqual(modelOld.$meta.changeFetchedPropNames.sort(), ["ECInstanceId", "LastMod", "GeometryGuid"].sort());
         assert.equal(modelOld.$meta.isIndirectChange, true);
         const elem = instances.find((i) => i.ECInstanceId === partialElementId && i.$meta.stage === "Old");
         expect(elem).to.exist;
@@ -1406,15 +1392,15 @@ describe("ChangesetReader insert-partial", () => {
             "Category",
         ].sort());
         // $meta keys
-        assert.deepEqual(Object.keys(elem.$meta).sort(), ["op", "tables", "changeIndexes", "stage", "instanceKey", "propFilter", "changeFetchedPropNames", "rowOptions", "isIndirectChange"].sort());
+        assert.deepEqual(Object.keys(elem.$meta).sort(), ["op", "tables", "changeIndexes", "stage", "instanceKey", "propFilter", "changeFetchedPropNames", "isIndirectChange"].sort());
         assert.equal(elem.$meta.op, "Deleted");
         assert.equal(elem.$meta.stage, "Old");
-        assert.deepEqual([...elem.$meta.tables].sort(), ["bis_Element", "bis_GeometricElement2d"].sort());
-        assert.deepEqual([...elem.$meta.changeIndexes].sort(), [1, 2].sort());
+        assert.deepEqual(elem.$meta.tables.sort(), ["bis_Element", "bis_GeometricElement2d"].sort());
+        assert.deepEqual(elem.$meta.changeIndexes.sort(), [1, 2].sort());
         assert.isString(elem.$meta.instanceKey);
         assert.equal(elem.$meta.instanceKey.split(`-`).length, 2);
         assert.equal(elem.$meta.propFilter, PropertyFilter.All);
-        assert.deepEqual([...elem.$meta.changeFetchedPropNames].sort(), [
+        assert.deepEqual(elem.$meta.changeFetchedPropNames.sort(), [
             'ECInstanceId', 'ECClassId', 'Model.Id', 'LastMod', 'CodeSpec.Id',
             'CodeScope.Id', 'CodeValue', 'UserLabel', 'Parent', 'FederationGuid',
             'JsonProperties', 'Category.Id', 'Origin', 'Rotation', 'BBoxLow', 'BBoxHigh',
@@ -1424,7 +1410,6 @@ describe("ChangesetReader insert-partial", () => {
             'StructProp.Pt2d', 'StructProp.Pt3d', 'IntArrProp', 'StrArrProp',
             'StructArrProp', 'RelatedElem'
         ].sort());
-        assert.deepEqual(elem.$meta.rowOptions, {});
         assert.isUndefined(elem.BinProp);
         assert.equal(elem.$meta.isIndirectChange, false);
     });
@@ -1443,7 +1428,7 @@ describe("ChangesetReader insert-partial", () => {
         assert.equal(modelNew.$meta.op, "Updated");
         assert.equal(modelNew.$meta.stage, "New");
         assert.equal(modelNew.$meta.propFilter, PropertyFilter.BisCoreElement);
-        assert.deepEqual([...modelNew.$meta.changeFetchedPropNames].sort(), ["ECInstanceId", "LastMod", "GeometryGuid"].sort());
+        assert.deepEqual(modelNew.$meta.changeFetchedPropNames.sort(), ["ECInstanceId", "LastMod", "GeometryGuid"].sort());
         assert.deepEqual(modelNew.$meta.rowOptions, { classIdsToClassNames: true });
         assert.equal(modelNew.$meta.isIndirectChange, true);
         // --- instances[1]: DrawingModel Updated Old ---
@@ -1456,7 +1441,7 @@ describe("ChangesetReader insert-partial", () => {
         assert.equal(modelOld.$meta.op, "Updated");
         assert.equal(modelOld.$meta.stage, "Old");
         assert.equal(modelOld.$meta.propFilter, PropertyFilter.BisCoreElement);
-        assert.deepEqual([...modelOld.$meta.changeFetchedPropNames].sort(), ["ECInstanceId", "LastMod", "GeometryGuid"].sort());
+        assert.deepEqual(modelOld.$meta.changeFetchedPropNames.sort(), ["ECInstanceId", "LastMod", "GeometryGuid"].sort());
         assert.deepEqual(modelOld.$meta.rowOptions, { classIdsToClassNames: true });
         assert.equal(modelOld.$meta.isIndirectChange, true);
         // --- instances[2]: Test2dElement (partial) Inserted New ---
@@ -1475,12 +1460,12 @@ describe("ChangesetReader insert-partial", () => {
         assert.deepEqual(Object.keys(elem.$meta).sort(), ["op", "tables", "changeIndexes", "stage", "instanceKey", "propFilter", "changeFetchedPropNames", "rowOptions", "isIndirectChange"].sort());
         assert.equal(elem.$meta.op, "Inserted");
         assert.equal(elem.$meta.stage, "New");
-        assert.deepEqual([...elem.$meta.tables].sort(), ["bis_Element", "bis_GeometricElement2d"].sort());
-        assert.deepEqual([...elem.$meta.changeIndexes].sort(), [1, 2].sort());
+        assert.deepEqual(elem.$meta.tables.sort(), ["bis_Element", "bis_GeometricElement2d"].sort());
+        assert.deepEqual(elem.$meta.changeIndexes.sort(), [1, 2].sort());
         assert.isString(elem.$meta.instanceKey);
         assert.equal(elem.$meta.instanceKey.split(`-`).length, 2);
         assert.equal(elem.$meta.propFilter, PropertyFilter.BisCoreElement);
-        assert.deepEqual([...elem.$meta.changeFetchedPropNames].sort(), ["ECInstanceId", "ECClassId", "CodeScope.Id",
+        assert.deepEqual(elem.$meta.changeFetchedPropNames.sort(), ["ECInstanceId", "ECClassId", "CodeScope.Id",
             "CodeSpec.Id", "CodeValue", "FederationGuid", "JsonProperties", "LastMod", "Model.Id", "Parent", "UserLabel"].sort());
         assert.deepEqual(elem.$meta.rowOptions, { classIdsToClassNames: true });
         assert.equal(elem.$meta.isIndirectChange, false);
@@ -1494,12 +1479,11 @@ describe("ChangesetReader insert-partial", () => {
         assert.equal(modelNew.ECInstanceId, drawingModelId);
         assert.equal("BisCore:DrawingModel", rwIModel.getClassNameFromId(modelNew.ECClassId));
         assert.deepEqual(Object.keys(modelNew).sort(), ["ECInstanceId", "ECClassId", "$meta"].sort());
-        assert.deepEqual(Object.keys(modelNew.$meta).sort(), ["op", "tables", "changeIndexes", "stage", "instanceKey", "propFilter", "changeFetchedPropNames", "rowOptions", "isIndirectChange"].sort());
+        assert.deepEqual(Object.keys(modelNew.$meta).sort(), ["op", "tables", "changeIndexes", "stage", "instanceKey", "propFilter", "changeFetchedPropNames", "isIndirectChange"].sort());
         assert.equal(modelNew.$meta.op, "Updated");
         assert.equal(modelNew.$meta.stage, "New");
         assert.equal(modelNew.$meta.propFilter, PropertyFilter.InstanceKey);
-        assert.deepEqual([...modelNew.$meta.changeFetchedPropNames].sort(), ["ECInstanceId"].sort());
-        assert.deepEqual(modelNew.$meta.rowOptions, {});
+        assert.deepEqual(modelNew.$meta.changeFetchedPropNames, ["ECInstanceId"]);
         assert.equal(modelNew.$meta.isIndirectChange, true);
         // --- instances[1]: DrawingModel Updated Old ---
         const modelOld = instances.find((i) => i.ECInstanceId === drawingModelId && i.$meta.stage === "Old");
@@ -1507,12 +1491,11 @@ describe("ChangesetReader insert-partial", () => {
         assert.equal(modelOld.ECInstanceId, drawingModelId);
         assert.equal("BisCore:DrawingModel", rwIModel.getClassNameFromId(modelOld.ECClassId));
         assert.deepEqual(Object.keys(modelOld).sort(), ["ECInstanceId", "ECClassId", "$meta"].sort());
-        assert.deepEqual(Object.keys(modelOld.$meta).sort(), ["op", "tables", "changeIndexes", "stage", "instanceKey", "propFilter", "changeFetchedPropNames", "rowOptions", "isIndirectChange"].sort());
+        assert.deepEqual(Object.keys(modelOld.$meta).sort(), ["op", "tables", "changeIndexes", "stage", "instanceKey", "propFilter", "changeFetchedPropNames", "isIndirectChange"].sort());
         assert.equal(modelOld.$meta.op, "Updated");
         assert.equal(modelOld.$meta.stage, "Old");
         assert.equal(modelOld.$meta.propFilter, PropertyFilter.InstanceKey);
-        assert.deepEqual([...modelOld.$meta.changeFetchedPropNames].sort(), ["ECInstanceId"].sort());
-        assert.deepEqual(modelOld.$meta.rowOptions, {});
+        assert.deepEqual(modelOld.$meta.changeFetchedPropNames, ["ECInstanceId"]);
         assert.equal(modelOld.$meta.isIndirectChange, true);
         // --- instances[2]: Test2dElement (partial) Inserted New ---
         const elem = instances.find((i) => i.ECInstanceId === partialElementId && i.$meta.stage === "New");
@@ -1523,16 +1506,15 @@ describe("ChangesetReader insert-partial", () => {
         assert.isUndefined(elem.Model);
         assert.isUndefined(elem.LastMod);
         assert.deepEqual(Object.keys(elem).sort(), ["ECInstanceId", "ECClassId", "$meta"].sort());
-        assert.deepEqual(Object.keys(elem.$meta).sort(), ["op", "tables", "changeIndexes", "stage", "instanceKey", "propFilter", "changeFetchedPropNames", "rowOptions", "isIndirectChange"].sort());
+        assert.deepEqual(Object.keys(elem.$meta).sort(), ["op", "tables", "changeIndexes", "stage", "instanceKey", "propFilter", "changeFetchedPropNames", "isIndirectChange"].sort());
         assert.equal(elem.$meta.op, "Inserted");
         assert.equal(elem.$meta.stage, "New");
-        assert.deepEqual([...elem.$meta.tables].sort(), ["bis_Element", "bis_GeometricElement2d"].sort());
-        assert.deepEqual([...elem.$meta.changeIndexes].sort(), [1, 2].sort());
+        assert.deepEqual(elem.$meta.tables.sort(), ["bis_Element", "bis_GeometricElement2d"].sort());
+        assert.deepEqual(elem.$meta.changeIndexes.sort(), [1, 2].sort());
         assert.isString(elem.$meta.instanceKey);
         assert.equal(elem.$meta.instanceKey.split(`-`).length, 2);
         assert.equal(elem.$meta.propFilter, PropertyFilter.InstanceKey);
-        assert.deepEqual([...elem.$meta.changeFetchedPropNames].sort(), ["ECInstanceId", "ECClassId"].sort());
-        assert.deepEqual(elem.$meta.rowOptions, {});
+        assert.deepEqual(elem.$meta.changeFetchedPropNames.sort(), ["ECInstanceId", "ECClassId"].sort());
         assert.equal(elem.$meta.isIndirectChange, false);
     });
     it("txn2 insert-partial | rowOptions: classIdsToClassNames", () => {
@@ -1849,12 +1831,11 @@ describe("ChangesetReader update-full", () => {
         assert.isString(modelNew.LastMod);
         assert.isUndefined(modelNew.GeometryGuid); // no GeometryGuid in update txn model row
         assert.deepEqual(Object.keys(modelNew).sort(), ["ECInstanceId", "ECClassId", "LastMod", "$meta"].sort());
-        assert.deepEqual(Object.keys(modelNew.$meta).sort(), ["op", "tables", "changeIndexes", "stage", "instanceKey", "propFilter", "changeFetchedPropNames", "rowOptions", "isIndirectChange"].sort());
+        assert.deepEqual(Object.keys(modelNew.$meta).sort(), ["op", "tables", "changeIndexes", "stage", "instanceKey", "propFilter", "changeFetchedPropNames", "isIndirectChange"].sort());
         assert.equal(modelNew.$meta.op, "Updated");
         assert.equal(modelNew.$meta.stage, "New");
         assert.equal(modelNew.$meta.propFilter, PropertyFilter.All);
-        assert.deepEqual([...modelNew.$meta.changeFetchedPropNames].sort(), ["ECInstanceId", "LastMod"].sort());
-        assert.deepEqual(modelNew.$meta.rowOptions, {});
+        assert.deepEqual(modelNew.$meta.changeFetchedPropNames.sort(), ["ECInstanceId", "LastMod"].sort());
         assert.equal(modelNew.$meta.isIndirectChange, true);
         // --- instances[1]: DrawingModel Updated Old ---
         const modelOld = instances.find((i) => i.ECInstanceId === drawingModelId && i.$meta.stage === "Old");
@@ -1862,12 +1843,11 @@ describe("ChangesetReader update-full", () => {
         assert.equal("BisCore:DrawingModel", rwIModel.getClassNameFromId(modelOld.ECClassId));
         assert.isString(modelOld.LastMod);
         assert.deepEqual(Object.keys(modelOld).sort(), ["ECInstanceId", "ECClassId", "LastMod", "$meta"].sort());
-        assert.deepEqual(Object.keys(modelOld.$meta).sort(), ["op", "tables", "changeIndexes", "stage", "instanceKey", "propFilter", "changeFetchedPropNames", "rowOptions", "isIndirectChange"].sort());
+        assert.deepEqual(Object.keys(modelOld.$meta).sort(), ["op", "tables", "changeIndexes", "stage", "instanceKey", "propFilter", "changeFetchedPropNames", "isIndirectChange"].sort());
         assert.equal(modelOld.$meta.op, "Updated");
         assert.equal(modelOld.$meta.stage, "Old");
         assert.equal(modelOld.$meta.propFilter, PropertyFilter.All);
-        assert.deepEqual([...modelOld.$meta.changeFetchedPropNames].sort(), ["ECInstanceId", "LastMod"].sort());
-        assert.deepEqual(modelOld.$meta.rowOptions, {});
+        assert.deepEqual(modelOld.$meta.changeFetchedPropNames.sort(), ["ECInstanceId", "LastMod"].sort());
         assert.equal(modelOld.$meta.isIndirectChange, true);
         // --- instances[2]: Test2dElement Updated New ---
         const elemNew = instances.find((i) => i.ECInstanceId === fullElementId && i.$meta.stage === "New");
@@ -1901,21 +1881,20 @@ describe("ChangesetReader update-full", () => {
             "Pt2dProp", "Pt3dProp", "StructProp", "IntArrProp", "StrArrProp", "StructArrProp", "RelatedElem",
             "$meta", "LastMod", "BinProp"
         ].sort());
-        assert.deepEqual(Object.keys(elemNew.$meta).sort(), ["op", "tables", "changeIndexes", "stage", "instanceKey", "propFilter", "changeFetchedPropNames", "rowOptions", "isIndirectChange"].sort());
+        assert.deepEqual(Object.keys(elemNew.$meta).sort(), ["op", "tables", "changeIndexes", "stage", "instanceKey", "propFilter", "changeFetchedPropNames", "isIndirectChange"].sort());
         assert.equal(elemNew.$meta.op, "Updated");
         assert.equal(elemNew.$meta.stage, "New");
-        assert.deepEqual([...elemNew.$meta.tables].sort(), ["bis_GeometricElement2d", "bis_Element"].sort());
-        assert.deepEqual([...elemNew.$meta.changeIndexes].sort(), [1, 2].sort());
+        assert.deepEqual(elemNew.$meta.tables.sort(), ["bis_GeometricElement2d", "bis_Element"].sort());
+        assert.deepEqual(elemNew.$meta.changeIndexes.sort(), [1, 2].sort());
         assert.isString(elemNew.$meta.instanceKey);
         assert.equal(elemNew.$meta.instanceKey.split(`-`).length, 2);
         assert.equal(elemNew.$meta.propFilter, PropertyFilter.All);
-        assert.deepEqual([...elemNew.$meta.changeFetchedPropNames].sort(), [
+        assert.deepEqual(elemNew.$meta.changeFetchedPropNames.sort(), [
             "BoolProp", "DblProp", "DtProp", "ECInstanceId", "IntArrProp", "IntProp", "LastMod",
             "LongProp", "Pt2dProp", "Pt3dProp.X", "Pt3dProp.Y", "RelatedElem.Id", "StrArrProp",
             "StrProp", "StructArrProp", "StructProp.Label", "StructProp.Pt2d", "StructProp.Pt3d", "StructProp.X",
             "StructProp.Y", "StructProp.Z", "BinProp"
         ].sort());
-        assert.deepEqual(elemNew.$meta.rowOptions, {});
         assert.equal(elemNew.$meta.isIndirectChange, false);
         // --- instances[3]: Test2dElement Updated Old ---
         const elemOld = instances.find((i) => i.ECInstanceId === fullElementId && i.$meta.stage === "Old");
@@ -1947,18 +1926,17 @@ describe("ChangesetReader update-full", () => {
             "Pt2dProp", "Pt3dProp", "StructProp", "IntArrProp", "StrArrProp", "StructArrProp", "RelatedElem",
             "$meta", "LastMod", "BinProp"
         ].sort());
-        assert.deepEqual(Object.keys(elemOld.$meta).sort(), ["op", "tables", "changeIndexes", "stage", "instanceKey", "propFilter", "changeFetchedPropNames", "rowOptions", "isIndirectChange"].sort());
+        assert.deepEqual(Object.keys(elemOld.$meta).sort(), ["op", "tables", "changeIndexes", "stage", "instanceKey", "propFilter", "changeFetchedPropNames", "isIndirectChange"].sort());
         assert.equal(elemOld.$meta.op, "Updated");
         assert.equal(elemOld.$meta.stage, "Old");
-        assert.deepEqual([...elemOld.$meta.tables].sort(), ["bis_GeometricElement2d", "bis_Element"].sort());
+        assert.deepEqual(elemOld.$meta.tables.sort(), ["bis_GeometricElement2d", "bis_Element"].sort());
         assert.equal(elemOld.$meta.propFilter, PropertyFilter.All);
-        assert.deepEqual([...elemOld.$meta.changeFetchedPropNames].sort(), [
+        assert.deepEqual(elemOld.$meta.changeFetchedPropNames.sort(), [
             "BoolProp", "DblProp", "DtProp", "ECInstanceId", "IntArrProp", "IntProp", "LastMod",
             "LongProp", "Pt2dProp", "Pt3dProp.X", "Pt3dProp.Y", "RelatedElem.Id", "StrArrProp",
             "StrProp", "StructArrProp", "StructProp.Label", "StructProp.Pt2d", "StructProp.Pt3d", "StructProp.X",
             "StructProp.Y", "StructProp.Z", "BinProp"
         ].sort());
-        assert.deepEqual(elemOld.$meta.rowOptions, {});
         assert.equal(elemOld.$meta.isIndirectChange, false);
     });
     it("txn3 update-full | Bis_Element_Properties", () => {
@@ -1975,7 +1953,7 @@ describe("ChangesetReader update-full", () => {
         assert.equal(modelNew.$meta.op, "Updated");
         assert.equal(modelNew.$meta.stage, "New");
         assert.equal(modelNew.$meta.propFilter, PropertyFilter.BisCoreElement);
-        assert.deepEqual([...modelNew.$meta.changeFetchedPropNames].sort(), ["ECInstanceId", "LastMod"].sort());
+        assert.deepEqual(modelNew.$meta.changeFetchedPropNames.sort(), ["ECInstanceId", "LastMod"].sort());
         assert.deepEqual(modelNew.$meta.rowOptions, { classIdsToClassNames: true });
         assert.equal(modelNew.$meta.isIndirectChange, true);
         // --- instances[1]: DrawingModel Updated Old ---
@@ -1989,7 +1967,7 @@ describe("ChangesetReader update-full", () => {
         assert.equal(modelOld.$meta.op, "Updated");
         assert.equal(modelOld.$meta.stage, "Old");
         assert.equal(modelOld.$meta.propFilter, PropertyFilter.BisCoreElement);
-        assert.deepEqual([...modelOld.$meta.changeFetchedPropNames].sort(), ["ECInstanceId", "LastMod"].sort());
+        assert.deepEqual(modelOld.$meta.changeFetchedPropNames.sort(), ["ECInstanceId", "LastMod"].sort());
         assert.deepEqual(modelOld.$meta.rowOptions, { classIdsToClassNames: true });
         assert.equal(modelOld.$meta.isIndirectChange, true);
         // --- instances[2]: Test2dElement Updated New (no custom props) ---
@@ -2006,12 +1984,12 @@ describe("ChangesetReader update-full", () => {
         assert.deepEqual(Object.keys(elemNew.$meta).sort(), ["op", "tables", "changeIndexes", "stage", "instanceKey", "propFilter", "changeFetchedPropNames", "rowOptions", "isIndirectChange"].sort());
         assert.equal(elemNew.$meta.op, "Updated");
         assert.equal(elemNew.$meta.stage, "New");
-        assert.deepEqual([...elemNew.$meta.tables].sort(), ["bis_GeometricElement2d", "bis_Element"].sort());
-        assert.deepEqual([...elemNew.$meta.changeIndexes].sort(), [1, 2].sort());
+        assert.deepEqual(elemNew.$meta.tables.sort(), ["bis_GeometricElement2d", "bis_Element"].sort());
+        assert.deepEqual(elemNew.$meta.changeIndexes.sort(), [1, 2].sort());
         assert.isString(elemNew.$meta.instanceKey);
         assert.equal(elemNew.$meta.instanceKey.split(`-`).length, 2);
         assert.equal(elemNew.$meta.propFilter, PropertyFilter.BisCoreElement);
-        assert.deepEqual([...elemNew.$meta.changeFetchedPropNames].sort(), ["ECInstanceId", "LastMod"].sort());
+        assert.deepEqual(elemNew.$meta.changeFetchedPropNames.sort(), ["ECInstanceId", "LastMod"].sort());
         assert.deepEqual(elemNew.$meta.rowOptions, { classIdsToClassNames: true });
         assert.equal(elemNew.$meta.isIndirectChange, false);
         // --- instances[3]: Test2dElement Updated Old ---
@@ -2026,9 +2004,9 @@ describe("ChangesetReader update-full", () => {
         assert.deepEqual(Object.keys(elemOld.$meta).sort(), ["op", "tables", "changeIndexes", "stage", "instanceKey", "propFilter", "changeFetchedPropNames", "rowOptions", "isIndirectChange"].sort());
         assert.equal(elemOld.$meta.op, "Updated");
         assert.equal(elemOld.$meta.stage, "Old");
-        assert.deepEqual([...elemOld.$meta.tables].sort(), ["bis_GeometricElement2d", "bis_Element"].sort());
+        assert.deepEqual(elemOld.$meta.tables.sort(), ["bis_GeometricElement2d", "bis_Element"].sort());
         assert.equal(elemOld.$meta.propFilter, PropertyFilter.BisCoreElement);
-        assert.deepEqual([...elemOld.$meta.changeFetchedPropNames].sort(), ["ECInstanceId", "LastMod"].sort());
+        assert.deepEqual(elemOld.$meta.changeFetchedPropNames.sort(), ["ECInstanceId", "LastMod"].sort());
         assert.deepEqual(elemOld.$meta.rowOptions, { classIdsToClassNames: true });
         assert.equal(elemOld.$meta.isIndirectChange, false);
     });
@@ -2041,12 +2019,11 @@ describe("ChangesetReader update-full", () => {
         assert.equal(modelNew.ECInstanceId, drawingModelId);
         assert.equal("BisCore:DrawingModel", rwIModel.getClassNameFromId(modelNew.ECClassId));
         assert.deepEqual(Object.keys(modelNew).sort(), ["ECInstanceId", "ECClassId", "$meta"].sort());
-        assert.deepEqual(Object.keys(modelNew.$meta).sort(), ["op", "tables", "changeIndexes", "stage", "instanceKey", "propFilter", "changeFetchedPropNames", "rowOptions", "isIndirectChange"].sort());
+        assert.deepEqual(Object.keys(modelNew.$meta).sort(), ["op", "tables", "changeIndexes", "stage", "instanceKey", "propFilter", "changeFetchedPropNames", "isIndirectChange"].sort());
         assert.equal(modelNew.$meta.op, "Updated");
         assert.equal(modelNew.$meta.stage, "New");
         assert.equal(modelNew.$meta.propFilter, PropertyFilter.InstanceKey);
-        assert.deepEqual([...modelNew.$meta.changeFetchedPropNames].sort(), ["ECInstanceId"].sort());
-        assert.deepEqual(modelNew.$meta.rowOptions, {});
+        assert.deepEqual(modelNew.$meta.changeFetchedPropNames, ["ECInstanceId"]);
         assert.equal(modelNew.$meta.isIndirectChange, true);
         // --- instances[1]: DrawingModel Updated Old ---
         const modelOld = instances.find((i) => i.ECInstanceId === drawingModelId && i.$meta.stage === "Old");
@@ -2054,12 +2031,11 @@ describe("ChangesetReader update-full", () => {
         assert.equal(modelOld.ECInstanceId, drawingModelId);
         assert.equal("BisCore:DrawingModel", rwIModel.getClassNameFromId(modelOld.ECClassId));
         assert.deepEqual(Object.keys(modelOld).sort(), ["ECInstanceId", "ECClassId", "$meta"].sort());
-        assert.deepEqual(Object.keys(modelOld.$meta).sort(), ["op", "tables", "changeIndexes", "stage", "instanceKey", "propFilter", "changeFetchedPropNames", "rowOptions", "isIndirectChange"].sort());
+        assert.deepEqual(Object.keys(modelOld.$meta).sort(), ["op", "tables", "changeIndexes", "stage", "instanceKey", "propFilter", "changeFetchedPropNames", "isIndirectChange"].sort());
         assert.equal(modelOld.$meta.op, "Updated");
         assert.equal(modelOld.$meta.stage, "Old");
         assert.equal(modelOld.$meta.propFilter, PropertyFilter.InstanceKey);
-        assert.deepEqual([...modelOld.$meta.changeFetchedPropNames].sort(), ["ECInstanceId"].sort());
-        assert.deepEqual(modelOld.$meta.rowOptions, {});
+        assert.deepEqual(modelOld.$meta.changeFetchedPropNames, ["ECInstanceId"]);
         assert.equal(modelOld.$meta.isIndirectChange, true);
         // --- instances[2]: Test2dElement Updated New ---
         const elemNew = instances.find((i) => i.ECInstanceId === fullElementId && i.$meta.stage === "New");
@@ -2070,16 +2046,15 @@ describe("ChangesetReader update-full", () => {
         assert.isUndefined(elemNew.Model);
         assert.isUndefined(elemNew.LastMod);
         assert.deepEqual(Object.keys(elemNew).sort(), ["ECInstanceId", "ECClassId", "$meta"].sort());
-        assert.deepEqual(Object.keys(elemNew.$meta).sort(), ["op", "tables", "changeIndexes", "stage", "instanceKey", "propFilter", "changeFetchedPropNames", "rowOptions", "isIndirectChange"].sort());
+        assert.deepEqual(Object.keys(elemNew.$meta).sort(), ["op", "tables", "changeIndexes", "stage", "instanceKey", "propFilter", "changeFetchedPropNames", "isIndirectChange"].sort());
         assert.equal(elemNew.$meta.op, "Updated");
         assert.equal(elemNew.$meta.stage, "New");
-        assert.deepEqual([...elemNew.$meta.tables].sort(), ["bis_GeometricElement2d", "bis_Element"].sort());
-        assert.deepEqual([...elemNew.$meta.changeIndexes].sort(), [1, 2].sort());
+        assert.deepEqual(elemNew.$meta.tables.sort(), ["bis_GeometricElement2d", "bis_Element"].sort());
+        assert.deepEqual(elemNew.$meta.changeIndexes.sort(), [1, 2].sort());
         assert.isString(elemNew.$meta.instanceKey);
         assert.equal(elemNew.$meta.instanceKey.split(`-`).length, 2);
         assert.equal(elemNew.$meta.propFilter, PropertyFilter.InstanceKey);
-        assert.deepEqual([...elemNew.$meta.changeFetchedPropNames].sort(), ["ECInstanceId"].sort());
-        assert.deepEqual(elemNew.$meta.rowOptions, {});
+        assert.deepEqual(elemNew.$meta.changeFetchedPropNames, ["ECInstanceId"]);
         assert.equal(elemNew.$meta.isIndirectChange, false);
         // --- instances[3]: Test2dElement Updated Old ---
         const elemOld = instances.find((i) => i.ECInstanceId === fullElementId && i.$meta.stage === "Old");
@@ -2089,13 +2064,12 @@ describe("ChangesetReader update-full", () => {
         assert.isUndefined(elemOld.StrProp);
         assert.isUndefined(elemOld.Model);
         assert.deepEqual(Object.keys(elemOld).sort(), ["ECInstanceId", "ECClassId", "$meta"].sort());
-        assert.deepEqual(Object.keys(elemOld.$meta).sort(), ["op", "tables", "changeIndexes", "stage", "instanceKey", "propFilter", "changeFetchedPropNames", "rowOptions", "isIndirectChange"].sort());
+        assert.deepEqual(Object.keys(elemOld.$meta).sort(), ["op", "tables", "changeIndexes", "stage", "instanceKey", "propFilter", "changeFetchedPropNames", "isIndirectChange"].sort());
         assert.equal(elemOld.$meta.op, "Updated");
         assert.equal(elemOld.$meta.stage, "Old");
-        assert.deepEqual([...elemOld.$meta.tables].sort(), ["bis_GeometricElement2d", "bis_Element"].sort());
+        assert.deepEqual(elemOld.$meta.tables.sort(), ["bis_GeometricElement2d", "bis_Element"].sort());
         assert.equal(elemOld.$meta.propFilter, PropertyFilter.InstanceKey);
-        assert.deepEqual([...elemOld.$meta.changeFetchedPropNames].sort(), ["ECInstanceId"].sort());
-        assert.deepEqual(elemOld.$meta.rowOptions, {});
+        assert.deepEqual(elemOld.$meta.changeFetchedPropNames, ["ECInstanceId"]);
         assert.equal(elemOld.$meta.isIndirectChange, false);
     });
     it("txn3 update-full | rowOptions: useJsName", () => {
@@ -2126,7 +2100,7 @@ describe("ChangesetReader update-full", () => {
         assert.deepEqual(Object.keys(elemNew).sort(), ["$meta", "binProp", "boolProp", "className",
             "dblProp", "dtProp", "id", "intArrProp", "intProp", "lastMod", "longProp", "pt2dProp",
             "pt3dProp", "relatedElem", "strArrProp", "strProp", "structArrProp", "structProp"].sort());
-        assert.deepEqual([...elemNew.$meta.changeFetchedPropNames].sort(), ["BinProp", "BoolProp",
+        assert.deepEqual(elemNew.$meta.changeFetchedPropNames.sort(), ["BinProp", "BoolProp",
             "DblProp", "DtProp", "ECInstanceId", "IntArrProp", "IntProp", "LastMod",
             "LongProp", "Pt2dProp", "Pt3dProp.X", "Pt3dProp.Y", "RelatedElem.Id", "StrArrProp", "StrProp",
             "StructArrProp", "StructProp.Label", "StructProp.Pt2d", "StructProp.Pt3d", "StructProp.X",
@@ -2143,7 +2117,7 @@ describe("ChangesetReader update-full", () => {
         assert.deepEqual(Object.keys(elemOld).sort(), ["$meta", "binProp", "boolProp", "className",
             "dblProp", "dtProp", "id", "intArrProp", "intProp", "lastMod", "longProp", "pt2dProp",
             "pt3dProp", "relatedElem", "strArrProp", "strProp", "structArrProp", "structProp"].sort());
-        assert.deepEqual([...elemOld.$meta.changeFetchedPropNames].sort(), ["BinProp", "BoolProp",
+        assert.deepEqual(elemOld.$meta.changeFetchedPropNames.sort(), ["BinProp", "BoolProp",
             "DblProp", "DtProp", "ECInstanceId", "IntArrProp", "IntProp", "LastMod",
             "LongProp", "Pt2dProp", "Pt3dProp.X", "Pt3dProp.Y", "RelatedElem.Id", "StrArrProp", "StrProp",
             "StructArrProp", "StructProp.Label", "StructProp.Pt2d", "StructProp.Pt3d", "StructProp.X",
@@ -2171,7 +2145,7 @@ describe("ChangesetReader update-full", () => {
         assert.deepEqual(Object.keys(elemNew).sort(), ["$meta", "BinProp", "BoolProp",
             "DblProp", "DtProp", "IntArrProp", "IntProp", "LastMod", "LongProp",
             "Pt2dProp", "Pt3dProp", "RelatedElem", "StrArrProp", "StrProp", "StructArrProp", "StructProp", "ECClassId", "ECInstanceId"].sort());
-        assert.deepEqual([...elemNew.$meta.changeFetchedPropNames].sort(), ["BinProp", "BoolProp",
+        assert.deepEqual(elemNew.$meta.changeFetchedPropNames.sort(), ["BinProp", "BoolProp",
             "DblProp", "DtProp", "ECInstanceId", "IntArrProp", "IntProp", "LastMod",
             "LongProp", "Pt2dProp", "Pt3dProp.X", "Pt3dProp.Y", "RelatedElem.Id", "StrArrProp", "StrProp",
             "StructArrProp", "StructProp.Label", "StructProp.Pt2d", "StructProp.Pt3d", "StructProp.X",
@@ -2185,7 +2159,7 @@ describe("ChangesetReader update-full", () => {
         assert.deepEqual(Object.keys(elemOld).sort(), ["$meta", "BinProp", "BoolProp",
             "DblProp", "DtProp", "IntArrProp", "IntProp", "LastMod", "LongProp",
             "Pt2dProp", "Pt3dProp", "RelatedElem", "StrArrProp", "StrProp", "StructArrProp", "StructProp", "ECClassId", "ECInstanceId"].sort());
-        assert.deepEqual([...elemOld.$meta.changeFetchedPropNames].sort(), ["BinProp", "BoolProp",
+        assert.deepEqual(elemOld.$meta.changeFetchedPropNames.sort(), ["BinProp", "BoolProp",
             "DblProp", "DtProp", "ECInstanceId", "IntArrProp", "IntProp", "LastMod",
             "LongProp", "Pt2dProp", "Pt3dProp.X", "Pt3dProp.Y", "RelatedElem.Id", "StrArrProp", "StrProp",
             "StructArrProp", "StructProp.Label", "StructProp.Pt2d", "StructProp.Pt3d", "StructProp.X",
@@ -2216,7 +2190,7 @@ describe("ChangesetReader update-full", () => {
         assert.deepEqual(Object.keys(elemNew).sort(), ["$meta", "binProp", "boolProp", "className",
             "dblProp", "dtProp", "id", "intArrProp", "intProp", "lastMod", "longProp", "pt2dProp",
             "pt3dProp", "relatedElem", "strArrProp", "strProp", "structArrProp", "structProp"].sort());
-        assert.deepEqual([...elemNew.$meta.changeFetchedPropNames].sort(), ["BinProp", "BoolProp",
+        assert.deepEqual(elemNew.$meta.changeFetchedPropNames.sort(), ["BinProp", "BoolProp",
             "DblProp", "DtProp", "ECInstanceId", "IntArrProp", "IntProp", "LastMod",
             "LongProp", "Pt2dProp", "Pt3dProp.X", "Pt3dProp.Y", "RelatedElem.Id", "StrArrProp", "StrProp",
             "StructArrProp", "StructProp.Label", "StructProp.Pt2d", "StructProp.Pt3d", "StructProp.X",
@@ -2232,7 +2206,7 @@ describe("ChangesetReader update-full", () => {
         assert.deepEqual(Object.keys(elemOld).sort(), ["$meta", "binProp", "boolProp", "className",
             "dblProp", "dtProp", "id", "intArrProp", "intProp", "lastMod", "longProp", "pt2dProp",
             "pt3dProp", "relatedElem", "strArrProp", "strProp", "structArrProp", "structProp"].sort());
-        assert.deepEqual([...elemOld.$meta.changeFetchedPropNames].sort(), ["BinProp", "BoolProp",
+        assert.deepEqual(elemOld.$meta.changeFetchedPropNames.sort(), ["BinProp", "BoolProp",
             "DblProp", "DtProp", "ECInstanceId", "IntArrProp", "IntProp", "LastMod",
             "LongProp", "Pt2dProp", "Pt3dProp.X", "Pt3dProp.Y", "RelatedElem.Id", "StrArrProp", "StrProp",
             "StructArrProp", "StructProp.Label", "StructProp.Pt2d", "StructProp.Pt3d", "StructProp.X",
@@ -2262,7 +2236,7 @@ describe("ChangesetReader update-full", () => {
         assert.deepEqual(Object.keys(elemNew).sort(), ["$meta", "BinProp", "BoolProp",
             "DblProp", "DtProp", "IntArrProp", "IntProp", "LastMod", "LongProp",
             "Pt2dProp", "Pt3dProp", "RelatedElem", "StrArrProp", "StrProp", "StructArrProp", "StructProp", "ECClassId", "ECInstanceId"].sort());
-        assert.deepEqual([...elemNew.$meta.changeFetchedPropNames].sort(), ["BinProp", "BoolProp",
+        assert.deepEqual(elemNew.$meta.changeFetchedPropNames.sort(), ["BinProp", "BoolProp",
             "DblProp", "DtProp", "ECInstanceId", "IntArrProp", "IntProp", "LastMod",
             "LongProp", "Pt2dProp", "Pt3dProp.X", "Pt3dProp.Y", "RelatedElem.Id", "StrArrProp", "StrProp",
             "StructArrProp", "StructProp.Label", "StructProp.Pt2d", "StructProp.Pt3d", "StructProp.X",
@@ -2279,7 +2253,7 @@ describe("ChangesetReader update-full", () => {
         assert.deepEqual(Object.keys(elemOld).sort(), ["$meta", "BinProp", "BoolProp",
             "DblProp", "DtProp", "IntArrProp", "IntProp", "LastMod", "LongProp",
             "Pt2dProp", "Pt3dProp", "RelatedElem", "StrArrProp", "StrProp", "StructArrProp", "StructProp", "ECClassId", "ECInstanceId"].sort());
-        assert.deepEqual([...elemOld.$meta.changeFetchedPropNames].sort(), ["BinProp", "BoolProp",
+        assert.deepEqual(elemOld.$meta.changeFetchedPropNames.sort(), ["BinProp", "BoolProp",
             "DblProp", "DtProp", "ECInstanceId", "IntArrProp", "IntProp", "LastMod",
             "LongProp", "Pt2dProp", "Pt3dProp.X", "Pt3dProp.Y", "RelatedElem.Id", "StrArrProp", "StrProp",
             "StructArrProp", "StructProp.Label", "StructProp.Pt2d", "StructProp.Pt3d", "StructProp.X",
@@ -2428,12 +2402,11 @@ describe("ChangesetReader delete-partial", () => {
         assert.isString(modelNew.LastMod);
         assert.isString(modelNew.GeometryGuid);
         assert.deepEqual(Object.keys(modelNew).sort(), ["ECInstanceId", "ECClassId", "LastMod", "GeometryGuid", "$meta"].sort());
-        assert.deepEqual(Object.keys(modelNew.$meta).sort(), ["op", "tables", "changeIndexes", "stage", "instanceKey", "propFilter", "changeFetchedPropNames", "rowOptions", "isIndirectChange"].sort());
+        assert.deepEqual(Object.keys(modelNew.$meta).sort(), ["op", "tables", "changeIndexes", "stage", "instanceKey", "propFilter", "changeFetchedPropNames", "isIndirectChange"].sort());
         assert.equal(modelNew.$meta.op, "Updated");
         assert.equal(modelNew.$meta.stage, "New");
         assert.equal(modelNew.$meta.propFilter, PropertyFilter.All);
-        assert.deepEqual([...modelNew.$meta.changeFetchedPropNames].sort(), ["ECInstanceId", "LastMod", "GeometryGuid"].sort());
-        assert.deepEqual(modelNew.$meta.rowOptions, {});
+        assert.deepEqual(modelNew.$meta.changeFetchedPropNames.sort(), ["ECInstanceId", "LastMod", "GeometryGuid"].sort());
         assert.equal(modelNew.$meta.isIndirectChange, true);
         // --- instances[1]: DrawingModel Updated Old ---
         const modelOld = instances.find((i) => i.ECInstanceId === drawingModelId && i.$meta.stage === "Old");
@@ -2443,12 +2416,11 @@ describe("ChangesetReader delete-partial", () => {
         assert.isString(modelOld.LastMod);
         assert.isString(modelOld.GeometryGuid);
         assert.deepEqual(Object.keys(modelOld).sort(), ["ECInstanceId", "ECClassId", "LastMod", "GeometryGuid", "$meta"].sort());
-        assert.deepEqual(Object.keys(modelOld.$meta).sort(), ["op", "tables", "changeIndexes", "stage", "instanceKey", "propFilter", "changeFetchedPropNames", "rowOptions", "isIndirectChange"].sort());
+        assert.deepEqual(Object.keys(modelOld.$meta).sort(), ["op", "tables", "changeIndexes", "stage", "instanceKey", "propFilter", "changeFetchedPropNames", "isIndirectChange"].sort());
         assert.equal(modelOld.$meta.op, "Updated");
         assert.equal(modelOld.$meta.stage, "Old");
         assert.equal(modelOld.$meta.propFilter, PropertyFilter.All);
-        assert.deepEqual([...modelOld.$meta.changeFetchedPropNames].sort(), ["ECInstanceId", "LastMod", "GeometryGuid"].sort());
-        assert.deepEqual(modelOld.$meta.rowOptions, {});
+        assert.deepEqual(modelOld.$meta.changeFetchedPropNames.sort(), ["ECInstanceId", "LastMod", "GeometryGuid"].sort());
         assert.equal(modelOld.$meta.isIndirectChange, true);
         // --- instances[2]: Test2dElement (partial) Deleted Old ---
         const elem = instances.find((i) => i.ECInstanceId === partialElementId && i.$meta.stage === "Old");
@@ -2475,20 +2447,19 @@ describe("ChangesetReader delete-partial", () => {
             "ECInstanceId", "ECClassId", "Model", "LastMod", "CodeSpec", "CodeScope", "FederationGuid", "$meta",
             "Category",
         ].sort());
-        assert.deepEqual(Object.keys(elem.$meta).sort(), ["op", "tables", "changeIndexes", "stage", "instanceKey", "propFilter", "changeFetchedPropNames", "rowOptions", "isIndirectChange"].sort());
+        assert.deepEqual(Object.keys(elem.$meta).sort(), ["op", "tables", "changeIndexes", "stage", "instanceKey", "propFilter", "changeFetchedPropNames", "isIndirectChange"].sort());
         assert.equal(elem.$meta.op, "Deleted");
         assert.equal(elem.$meta.stage, "Old");
-        assert.deepEqual([...elem.$meta.tables].sort(), ["bis_Element", "bis_GeometricElement2d"].sort());
-        assert.deepEqual([...elem.$meta.changeIndexes].sort(), [1, 2].sort());
+        assert.deepEqual(elem.$meta.tables.sort(), ["bis_Element", "bis_GeometricElement2d"].sort());
+        assert.deepEqual(elem.$meta.changeIndexes.sort(), [1, 2].sort());
         assert.isString(elem.$meta.instanceKey);
         assert.equal(elem.$meta.instanceKey.split(`-`).length, 2);
         assert.equal(elem.$meta.propFilter, PropertyFilter.All);
-        assert.deepEqual([...elem.$meta.changeFetchedPropNames].sort(), ["BBoxHigh", "BBoxLow", "BinProp", "BoolProp",
+        assert.deepEqual(elem.$meta.changeFetchedPropNames.sort(), ["BBoxHigh", "BBoxLow", "BinProp", "BoolProp",
             "Category.Id", "CodeScope.Id", "CodeSpec.Id", "CodeValue", "DblProp", "DtProp", "ECClassId", "ECInstanceId", "FederationGuid", "GeometryStream",
             "IntArrProp", "IntProp", "JsonProperties", "LastMod", "LongProp", "Model.Id", "Origin", "Parent", "Pt2dProp", "Pt3dProp", "RelatedElem", "Rotation", "StrArrProp", "StrProp",
             "StructArrProp", "StructProp.Label", "StructProp.Pt2d", "StructProp.Pt3d", "StructProp.X", "StructProp.Y", "StructProp.Z", "TypeDefinition", "UserLabel"
         ].sort());
-        assert.deepEqual(elem.$meta.rowOptions, {});
         assert.equal(elem.$meta.isIndirectChange, false);
     });
     it("txn4 delete-partial | Bis_Element_Properties", () => {
@@ -2506,7 +2477,7 @@ describe("ChangesetReader delete-partial", () => {
         assert.equal(modelNew.$meta.op, "Updated");
         assert.equal(modelNew.$meta.stage, "New");
         assert.equal(modelNew.$meta.propFilter, PropertyFilter.BisCoreElement);
-        assert.deepEqual([...modelNew.$meta.changeFetchedPropNames].sort(), ["ECInstanceId", "LastMod", "GeometryGuid"].sort());
+        assert.deepEqual(modelNew.$meta.changeFetchedPropNames.sort(), ["ECInstanceId", "LastMod", "GeometryGuid"].sort());
         assert.deepEqual(modelNew.$meta.rowOptions, { classIdsToClassNames: true });
         assert.equal(modelNew.$meta.isIndirectChange, true);
         // --- instances[1]: DrawingModel Updated Old ---
@@ -2521,7 +2492,7 @@ describe("ChangesetReader delete-partial", () => {
         assert.equal(modelOld.$meta.op, "Updated");
         assert.equal(modelOld.$meta.stage, "Old");
         assert.equal(modelOld.$meta.propFilter, PropertyFilter.BisCoreElement);
-        assert.deepEqual([...modelOld.$meta.changeFetchedPropNames].sort(), ["ECInstanceId", "LastMod", "GeometryGuid"].sort());
+        assert.deepEqual(modelOld.$meta.changeFetchedPropNames.sort(), ["ECInstanceId", "LastMod", "GeometryGuid"].sort());
         assert.deepEqual(modelOld.$meta.rowOptions, { classIdsToClassNames: true });
         assert.equal(modelOld.$meta.isIndirectChange, true);
         // --- instances[2]: Test2dElement (partial) Deleted Old ---
@@ -2540,12 +2511,12 @@ describe("ChangesetReader delete-partial", () => {
         assert.deepEqual(Object.keys(elem.$meta).sort(), ["op", "tables", "changeIndexes", "stage", "instanceKey", "propFilter", "changeFetchedPropNames", "rowOptions", "isIndirectChange"].sort());
         assert.equal(elem.$meta.op, "Deleted");
         assert.equal(elem.$meta.stage, "Old");
-        assert.deepEqual([...elem.$meta.tables].sort(), ["bis_Element", "bis_GeometricElement2d"].sort());
-        assert.deepEqual([...elem.$meta.changeIndexes].sort(), [1, 2].sort());
+        assert.deepEqual(elem.$meta.tables.sort(), ["bis_Element", "bis_GeometricElement2d"].sort());
+        assert.deepEqual(elem.$meta.changeIndexes.sort(), [1, 2].sort());
         assert.isString(elem.$meta.instanceKey);
         assert.equal(elem.$meta.instanceKey.split(`-`).length, 2);
         assert.equal(elem.$meta.propFilter, PropertyFilter.BisCoreElement);
-        assert.deepEqual([...elem.$meta.changeFetchedPropNames].sort(), ["CodeScope.Id", "CodeSpec.Id", "CodeValue", "ECClassId", "ECInstanceId",
+        assert.deepEqual(elem.$meta.changeFetchedPropNames.sort(), ["CodeScope.Id", "CodeSpec.Id", "CodeValue", "ECClassId", "ECInstanceId",
             "FederationGuid", "JsonProperties", "LastMod", "Model.Id", "Parent", "UserLabel"].sort());
         assert.deepEqual(elem.$meta.rowOptions, { classIdsToClassNames: true });
         assert.equal(elem.$meta.isIndirectChange, false);
@@ -2559,12 +2530,11 @@ describe("ChangesetReader delete-partial", () => {
         assert.equal(modelNew.ECInstanceId, drawingModelId);
         assert.equal("BisCore:DrawingModel", rwIModel.getClassNameFromId(modelNew.ECClassId));
         assert.deepEqual(Object.keys(modelNew).sort(), ["ECInstanceId", "ECClassId", "$meta"].sort());
-        assert.deepEqual(Object.keys(modelNew.$meta).sort(), ["op", "tables", "changeIndexes", "stage", "instanceKey", "propFilter", "changeFetchedPropNames", "rowOptions", "isIndirectChange"].sort());
+        assert.deepEqual(Object.keys(modelNew.$meta).sort(), ["op", "tables", "changeIndexes", "stage", "instanceKey", "propFilter", "changeFetchedPropNames", "isIndirectChange"].sort());
         assert.equal(modelNew.$meta.op, "Updated");
         assert.equal(modelNew.$meta.stage, "New");
         assert.equal(modelNew.$meta.propFilter, PropertyFilter.InstanceKey);
-        assert.deepEqual([...modelNew.$meta.changeFetchedPropNames].sort(), ["ECInstanceId"].sort());
-        assert.deepEqual(modelNew.$meta.rowOptions, {});
+        assert.deepEqual(modelNew.$meta.changeFetchedPropNames, ["ECInstanceId"]);
         assert.equal(modelNew.$meta.isIndirectChange, true);
         // --- instances[1]: DrawingModel Updated Old ---
         const modelOld = instances.find((i) => i.ECInstanceId === drawingModelId && i.$meta.stage === "Old");
@@ -2572,12 +2542,11 @@ describe("ChangesetReader delete-partial", () => {
         assert.equal(modelOld.ECInstanceId, drawingModelId);
         assert.equal("BisCore:DrawingModel", rwIModel.getClassNameFromId(modelOld.ECClassId));
         assert.deepEqual(Object.keys(modelOld).sort(), ["ECInstanceId", "ECClassId", "$meta"].sort());
-        assert.deepEqual(Object.keys(modelOld.$meta).sort(), ["op", "tables", "changeIndexes", "stage", "instanceKey", "propFilter", "changeFetchedPropNames", "rowOptions", "isIndirectChange"].sort());
+        assert.deepEqual(Object.keys(modelOld.$meta).sort(), ["op", "tables", "changeIndexes", "stage", "instanceKey", "propFilter", "changeFetchedPropNames", "isIndirectChange"].sort());
         assert.equal(modelOld.$meta.op, "Updated");
         assert.equal(modelOld.$meta.stage, "Old");
         assert.equal(modelOld.$meta.propFilter, PropertyFilter.InstanceKey);
-        assert.deepEqual([...modelOld.$meta.changeFetchedPropNames].sort(), ["ECInstanceId"].sort());
-        assert.deepEqual(modelOld.$meta.rowOptions, {});
+        assert.deepEqual(modelOld.$meta.changeFetchedPropNames, ["ECInstanceId"]);
         assert.equal(modelOld.$meta.isIndirectChange, true);
         // --- instances[2]: Test2dElement (partial) Deleted Old ---
         const elem = instances.find((i) => i.ECInstanceId === partialElementId && i.$meta.stage === "Old");
@@ -2588,16 +2557,15 @@ describe("ChangesetReader delete-partial", () => {
         assert.isUndefined(elem.Model);
         assert.isUndefined(elem.LastMod);
         assert.deepEqual(Object.keys(elem).sort(), ["ECInstanceId", "ECClassId", "$meta"].sort());
-        assert.deepEqual(Object.keys(elem.$meta).sort(), ["op", "tables", "changeIndexes", "stage", "instanceKey", "propFilter", "changeFetchedPropNames", "rowOptions", "isIndirectChange"].sort());
+        assert.deepEqual(Object.keys(elem.$meta).sort(), ["op", "tables", "changeIndexes", "stage", "instanceKey", "propFilter", "changeFetchedPropNames", "isIndirectChange"].sort());
         assert.equal(elem.$meta.op, "Deleted");
         assert.equal(elem.$meta.stage, "Old");
-        assert.deepEqual([...elem.$meta.tables].sort(), ["bis_Element", "bis_GeometricElement2d"].sort());
-        assert.deepEqual([...elem.$meta.changeIndexes].sort(), [1, 2].sort());
+        assert.deepEqual(elem.$meta.tables.sort(), ["bis_Element", "bis_GeometricElement2d"].sort());
+        assert.deepEqual(elem.$meta.changeIndexes.sort(), [1, 2].sort());
         assert.isString(elem.$meta.instanceKey);
         assert.equal(elem.$meta.instanceKey.split(`-`).length, 2);
         assert.equal(elem.$meta.propFilter, PropertyFilter.InstanceKey);
-        assert.deepEqual([...elem.$meta.changeFetchedPropNames].sort(), ['ECClassId', 'ECInstanceId'].sort());
-        assert.deepEqual(elem.$meta.rowOptions, {});
+        assert.deepEqual(elem.$meta.changeFetchedPropNames.sort(), ['ECClassId', 'ECInstanceId'].sort());
         assert.equal(elem.$meta.isIndirectChange, false);
     });
     it("txn4 delete-partial | rowOptions: classIdsToClassNames", () => {
@@ -2885,16 +2853,15 @@ describe("ChangesetReader filters", () => {
             // Object.keys
             assert.deepEqual(Object.keys(modelNew).sort(), ["ECInstanceId", "ECClassId", "LastMod", "GeometryGuid", "$meta"].sort());
             // $meta keys
-            assert.deepEqual(Object.keys(modelNew.$meta).sort(), ["op", "tables", "changeIndexes", "stage", "instanceKey", "propFilter", "changeFetchedPropNames", "rowOptions", "isIndirectChange"].sort());
+            assert.deepEqual(Object.keys(modelNew.$meta).sort(), ["op", "tables", "changeIndexes", "stage", "instanceKey", "propFilter", "changeFetchedPropNames", "isIndirectChange"].sort());
             assert.equal(modelNew.$meta.op, "Updated");
             assert.equal(modelNew.$meta.stage, "New");
-            assert.deepEqual([...modelNew.$meta.tables].sort(), ["bis_Model"].sort());
-            assert.deepEqual([...modelNew.$meta.changeIndexes].sort(), [1].sort());
+            assert.deepEqual(modelNew.$meta.tables, ["bis_Model"]);
+            assert.deepEqual(modelNew.$meta.changeIndexes, [1]);
             assert.isString(modelNew.$meta.instanceKey);
             assert.equal(modelNew.$meta.instanceKey.split(`-`).length, 2);
             assert.equal(modelNew.$meta.propFilter, PropertyFilter.All);
-            assert.deepEqual([...modelNew.$meta.changeFetchedPropNames].sort(), ["ECInstanceId", "LastMod", "GeometryGuid"].sort());
-            assert.deepEqual(modelNew.$meta.rowOptions, {});
+            assert.deepEqual(modelNew.$meta.changeFetchedPropNames.sort(), ["ECInstanceId", "LastMod", "GeometryGuid"].sort());
             assert.equal(modelNew.$meta.isIndirectChange, true);
             // --- instances[1]: DrawingModel Updated Old ---
             const modelOld = instances.find((i) => i.ECInstanceId === drawingModelId && i.$meta.stage === "Old");
@@ -2904,13 +2871,12 @@ describe("ChangesetReader filters", () => {
             // Object.keys
             assert.deepEqual(Object.keys(modelOld).sort(), ["ECInstanceId", "ECClassId", "$meta"].sort());
             // $meta keys
-            assert.deepEqual(Object.keys(modelOld.$meta).sort(), ["op", "tables", "changeIndexes", "stage", "instanceKey", "propFilter", "changeFetchedPropNames", "rowOptions", "isIndirectChange"].sort());
+            assert.deepEqual(Object.keys(modelOld.$meta).sort(), ["op", "tables", "changeIndexes", "stage", "instanceKey", "propFilter", "changeFetchedPropNames", "isIndirectChange"].sort());
             assert.equal(modelOld.$meta.op, "Updated");
             assert.equal(modelOld.$meta.stage, "Old");
-            assert.deepEqual([...modelOld.$meta.tables].sort(), ["bis_Model"].sort());
+            assert.deepEqual(modelOld.$meta.tables, ["bis_Model"]);
             assert.equal(modelOld.$meta.propFilter, PropertyFilter.All);
-            assert.deepEqual([...modelOld.$meta.changeFetchedPropNames].sort(), ["ECInstanceId", "LastMod", "GeometryGuid"].sort());
-            assert.deepEqual(modelOld.$meta.rowOptions, {});
+            assert.deepEqual(modelOld.$meta.changeFetchedPropNames.sort(), ["ECInstanceId", "LastMod", "GeometryGuid"].sort());
             assert.equal(modelOld.$meta.isIndirectChange, true);
         }
         catch (e_11) {
@@ -2976,15 +2942,15 @@ describe("ChangesetReader filters", () => {
                 "Pt2dProp", "Pt3dProp", "StructProp", "IntArrProp", "StrArrProp", "StructArrProp", "RelatedElem", "BinProp"
             ].sort());
             // $meta keys
-            assert.deepEqual(Object.keys(elem.$meta).sort(), ["op", "tables", "changeIndexes", "stage", "instanceKey", "propFilter", "changeFetchedPropNames", "rowOptions", "isIndirectChange"].sort());
+            assert.deepEqual(Object.keys(elem.$meta).sort(), ["op", "tables", "changeIndexes", "stage", "instanceKey", "propFilter", "changeFetchedPropNames", "isIndirectChange"].sort());
             assert.equal(elem.$meta.op, "Inserted");
             assert.equal(elem.$meta.stage, "New");
-            assert.deepEqual([...elem.$meta.tables].sort(), ["bis_Element", "bis_GeometricElement2d"].sort());
-            assert.deepEqual([...elem.$meta.changeIndexes].sort(), [1, 2].sort());
+            assert.deepEqual(elem.$meta.tables.sort(), ["bis_Element", "bis_GeometricElement2d"].sort());
+            assert.deepEqual(elem.$meta.changeIndexes.sort(), [1, 2].sort());
             assert.isString(elem.$meta.instanceKey);
             assert.equal(elem.$meta.instanceKey.split(`-`).length, 2);
             assert.equal(elem.$meta.propFilter, PropertyFilter.All);
-            assert.deepEqual([...elem.$meta.changeFetchedPropNames].sort(), [
+            assert.deepEqual(elem.$meta.changeFetchedPropNames.sort(), [
                 'BBoxHigh', 'BBoxLow', 'BinProp', 'BoolProp', 'Category.Id', 'CodeScope.Id',
                 'CodeSpec.Id', 'CodeValue', 'DblProp', 'DtProp', 'ECClassId', 'ECInstanceId',
                 'FederationGuid', 'GeometryStream', 'IntArrProp', 'IntProp', 'JsonProperties',
@@ -2993,7 +2959,6 @@ describe("ChangesetReader filters", () => {
                 'StructProp.Pt2d', 'StructProp.Pt3d', 'StructProp.X', 'StructProp.Y', 'StructProp.Z',
                 'TypeDefinition', 'UserLabel'
             ].sort());
-            assert.deepEqual(elem.$meta.rowOptions, {});
             assert.equal(elem.$meta.isIndirectChange, false);
         }
         catch (e_12) {
@@ -3024,16 +2989,15 @@ describe("ChangesetReader filters", () => {
             // Object.keys
             assert.deepEqual(Object.keys(modelNew).sort(), ["ECInstanceId", "ECClassId", "LastMod", "GeometryGuid", "$meta"].sort());
             // $meta keys
-            assert.deepEqual(Object.keys(modelNew.$meta).sort(), ["op", "tables", "changeIndexes", "stage", "instanceKey", "propFilter", "changeFetchedPropNames", "rowOptions", "isIndirectChange"].sort());
+            assert.deepEqual(Object.keys(modelNew.$meta).sort(), ["op", "tables", "changeIndexes", "stage", "instanceKey", "propFilter", "changeFetchedPropNames", "isIndirectChange"].sort());
             assert.equal(modelNew.$meta.op, "Updated");
             assert.equal(modelNew.$meta.stage, "New");
-            assert.deepEqual([...modelNew.$meta.tables].sort(), ["bis_Model"].sort());
-            assert.deepEqual([...modelNew.$meta.changeIndexes].sort(), [1].sort());
+            assert.deepEqual(modelNew.$meta.tables, ["bis_Model"]);
+            assert.deepEqual(modelNew.$meta.changeIndexes, [1]);
             assert.isString(modelNew.$meta.instanceKey);
             assert.equal(modelNew.$meta.instanceKey.split(`-`).length, 2);
             assert.equal(modelNew.$meta.propFilter, PropertyFilter.All);
-            assert.deepEqual([...modelNew.$meta.changeFetchedPropNames].sort(), ["ECInstanceId", "LastMod", "GeometryGuid"].sort());
-            assert.deepEqual(modelNew.$meta.rowOptions, {});
+            assert.deepEqual(modelNew.$meta.changeFetchedPropNames.sort(), ["ECInstanceId", "LastMod", "GeometryGuid"].sort());
             assert.equal(modelNew.$meta.isIndirectChange, true);
             // --- instances[1]: DrawingModel Updated Old ---
             const modelOld = instances.find((i) => i.ECInstanceId === drawingModelId && i.$meta.stage === "Old");
@@ -3043,13 +3007,12 @@ describe("ChangesetReader filters", () => {
             // Object.keys
             assert.deepEqual(Object.keys(modelOld).sort(), ["ECInstanceId", "ECClassId", "$meta"].sort());
             // $meta keys
-            assert.deepEqual(Object.keys(modelOld.$meta).sort(), ["op", "tables", "changeIndexes", "stage", "instanceKey", "propFilter", "changeFetchedPropNames", "rowOptions", "isIndirectChange"].sort());
+            assert.deepEqual(Object.keys(modelOld.$meta).sort(), ["op", "tables", "changeIndexes", "stage", "instanceKey", "propFilter", "changeFetchedPropNames", "isIndirectChange"].sort());
             assert.equal(modelOld.$meta.op, "Updated");
             assert.equal(modelOld.$meta.stage, "Old");
-            assert.deepEqual([...modelOld.$meta.tables].sort(), ["bis_Model"].sort());
+            assert.deepEqual(modelOld.$meta.tables, ["bis_Model"]);
             assert.equal(modelOld.$meta.propFilter, PropertyFilter.All);
-            assert.deepEqual([...modelOld.$meta.changeFetchedPropNames].sort(), ["ECInstanceId", "LastMod", "GeometryGuid"].sort());
-            assert.deepEqual(modelOld.$meta.rowOptions, {});
+            assert.deepEqual(modelOld.$meta.changeFetchedPropNames.sort(), ["ECInstanceId", "LastMod", "GeometryGuid"].sort());
             assert.equal(modelOld.$meta.isIndirectChange, true);
         }
         catch (e_13) {
@@ -3060,6 +3023,21 @@ describe("ChangesetReader filters", () => {
             __disposeResources(env_13);
         }
     });
+    it("read txn1 to some extent not the entire txn from the spill file and then close should happen without any issue", () => {
+        const env_14 = { stack: [], error: void 0, hasError: false };
+        try {
+            const reader = __addDisposableResource(env_14, ChangesetReader.openTxn({ db: rwIModel, txnId }), false);
+            assert.isTrue(reader.step());
+            expect(() => reader.close()).to.not.throw();
+        }
+        catch (e_14) {
+            env_14.error = e_14;
+            env_14.hasError = true;
+        }
+        finally {
+            __disposeResources(env_14);
+        }
+    });
 });
 describe("ChangesetReader — openFile + openGroup", () => {
     let rwIModel;
@@ -3130,10 +3108,10 @@ describe("ChangesetReader — openFile + openGroup", () => {
         const insertCs = changesets[1];
         // === openFile: insert changeset ===
         {
-            const env_14 = { stack: [], error: void 0, hasError: false };
+            const env_15 = { stack: [], error: void 0, hasError: false };
             try {
-                const reader = __addDisposableResource(env_14, ChangesetReader.openFile({ db: rwIModel, fileName: insertCs.pathname, rowOptions: { abbreviateBlobs: false } }), false);
-                const pcu = __addDisposableResource(env_14, new PartialChangeUnifier(ChangeUnifierCache.createInMemoryCache()), false);
+                const reader = __addDisposableResource(env_15, ChangesetReader.openFile({ db: rwIModel, fileName: insertCs.pathname, rowOptions: { abbreviateBlobs: false } }), false);
+                const pcu = __addDisposableResource(env_15, new PartialChangeUnifier(ChangeUnifierCache.createInMemoryCache()), false);
                 while (reader.step())
                     pcu.appendFrom(reader);
                 const instances = Array.from(pcu.instances);
@@ -3163,18 +3141,18 @@ describe("ChangesetReader — openFile + openGroup", () => {
                 assert.deepEqual(Object.keys(elemNew).sort(), ["ECInstanceId", "ECClassId", "Model", "CodeSpec",
                     "CodeScope", "FederationGuid", "$meta", "Category", "LastMod",
                     "BinProp", "GuidArrProp"].sort());
-                assert.deepEqual([...elemNew.$meta.changeFetchedPropNames].sort(), ['BBoxHigh', 'BBoxLow', 'BinProp',
+                assert.deepEqual(elemNew.$meta.changeFetchedPropNames.sort(), ['BBoxHigh', 'BBoxLow', 'BinProp',
                     'Category.Id', 'CodeScope.Id', 'CodeSpec.Id', 'CodeValue',
                     'ECClassId', 'ECInstanceId', 'FederationGuid', 'GeometryStream', 'GuidArrProp',
                     'JsonProperties', 'LastMod', 'Model.Id', 'Origin', 'Parent', 'Pt3dProp', 'Rotation',
                     'TypeDefinition', 'UserLabel'].sort());
             }
-            catch (e_14) {
-                env_14.error = e_14;
-                env_14.hasError = true;
+            catch (e_15) {
+                env_15.error = e_15;
+                env_15.hasError = true;
             }
             finally {
-                __disposeResources(env_14);
+                __disposeResources(env_15);
             }
         }
         // Wait so that LastMod on bis_Model gets a distinct timestamp before the update txn
@@ -3197,10 +3175,10 @@ describe("ChangesetReader — openFile + openGroup", () => {
         const updateCs = changesets[2];
         // === openFile: update changeset ===
         {
-            const env_15 = { stack: [], error: void 0, hasError: false };
+            const env_16 = { stack: [], error: void 0, hasError: false };
             try {
-                const reader = __addDisposableResource(env_15, ChangesetReader.openFile({ db: rwIModel, fileName: updateCs.pathname, rowOptions: { abbreviateBlobs: false } }), false);
-                const pcu = __addDisposableResource(env_15, new PartialChangeUnifier(ChangeUnifierCache.createInMemoryCache()), false);
+                const reader = __addDisposableResource(env_16, ChangesetReader.openFile({ db: rwIModel, fileName: updateCs.pathname, rowOptions: { abbreviateBlobs: false } }), false);
+                const pcu = __addDisposableResource(env_16, new PartialChangeUnifier(ChangeUnifierCache.createInMemoryCache()), false);
                 while (reader.step())
                     pcu.appendFrom(reader);
                 const instances = Array.from(pcu.instances);
@@ -3223,7 +3201,7 @@ describe("ChangesetReader — openFile + openGroup", () => {
                 assert.deepEqual(elemNew.BBoxHigh, { X: 0, Y: 0 });
                 assert.deepEqual(elemNew.Rotation, 0);
                 expect(elemNew.LastMod).to.exist;
-                assert.deepEqual([...elemNew.$meta.changeFetchedPropNames].sort(), ['BBoxHigh', 'BBoxLow', 'BinProp', 'ECInstanceId', 'GuidArrProp', 'LastMod', 'Origin', 'Pt3dProp', 'Rotation'].sort());
+                assert.deepEqual(elemNew.$meta.changeFetchedPropNames.sort(), ['BBoxHigh', 'BBoxLow', 'BinProp', 'ECInstanceId', 'GuidArrProp', 'LastMod', 'Origin', 'Pt3dProp', 'Rotation'].sort());
                 assert.equal(elemOld.$meta.op, "Updated");
                 assert.equal(elemOld.$meta.stage, "Old");
                 assert.deepEqual(Object.keys(elemOld.$meta).sort(), ["op", "tables", "changeIndexes", "stage", "propFilter", "rowOptions", "changeFetchedPropNames", "instanceKey", "isIndirectChange"].sort());
@@ -3236,25 +3214,22 @@ describe("ChangesetReader — openFile + openGroup", () => {
                 ]);
                 assert.equal(elemOld.$meta.isIndirectChange, false);
                 expect(elemOld.LastMod).to.exist;
-                assert.deepEqual([...elemOld.$meta.changeFetchedPropNames].sort(), ['BBoxHigh', 'BBoxLow', 'BinProp', 'ECInstanceId', 'GuidArrProp', 'LastMod', 'Origin', 'Pt3dProp', 'Rotation'].sort());
+                assert.deepEqual(elemOld.$meta.changeFetchedPropNames.sort(), ['BBoxHigh', 'BBoxLow', 'BinProp', 'ECInstanceId', 'GuidArrProp', 'LastMod', 'Origin', 'Pt3dProp', 'Rotation'].sort());
             }
-            catch (e_15) {
-                env_15.error = e_15;
-                env_15.hasError = true;
+            catch (e_16) {
+                env_16.error = e_16;
+                env_16.hasError = true;
             }
             finally {
-                __disposeResources(env_15);
+                __disposeResources(env_16);
             }
         }
-        // === openGroup: insert + update as a single stream ===
-        // After merging, the elem New key is shared between insert-New and update-New;
-        // the update-New wins on overlapping props, so the final New reflects the updated state.
-        // elem Old only comes from the update changeset.
+        // === openGroup: insert + update as a single stream becomes just insert ===
         {
-            const env_16 = { stack: [], error: void 0, hasError: false };
+            const env_17 = { stack: [], error: void 0, hasError: false };
             try {
-                const reader = __addDisposableResource(env_16, ChangesetReader.openGroup({ db: rwIModel, changesetFiles: [insertCs.pathname, updateCs.pathname], rowOptions: { abbreviateBlobs: false } }), false);
-                const pcu = __addDisposableResource(env_16, new PartialChangeUnifier(ChangeUnifierCache.createInMemoryCache()), false);
+                const reader = __addDisposableResource(env_17, ChangesetReader.openGroup({ db: rwIModel, changesetFiles: [insertCs.pathname, updateCs.pathname], rowOptions: { abbreviateBlobs: false } }), false);
+                const pcu = __addDisposableResource(env_17, new PartialChangeUnifier(ChangeUnifierCache.createInMemoryCache()), false);
                 while (reader.step())
                     pcu.appendFrom(reader);
                 const instances = Array.from(pcu.instances);
@@ -3287,19 +3262,19 @@ describe("ChangesetReader — openFile + openGroup", () => {
                 assert.deepEqual(Object.keys(elemNew).sort(), ["ECInstanceId", "ECClassId", "Model", "CodeSpec",
                     "CodeScope", "FederationGuid", "$meta", "Category", "LastMod",
                     "BinProp", "GuidArrProp", "Origin", "Rotation", "BBoxLow", "BBoxHigh", "Pt3dProp"].sort());
-                assert.deepEqual([...elemNew.$meta.changeFetchedPropNames].sort(), ['BBoxHigh', 'BBoxLow',
+                assert.deepEqual(elemNew.$meta.changeFetchedPropNames.sort(), ['BBoxHigh', 'BBoxLow',
                     'BinProp', 'Category.Id', 'CodeScope.Id', 'CodeSpec.Id',
                     'CodeValue', 'ECClassId', 'ECInstanceId', 'FederationGuid', 'GeometryStream',
                     'GuidArrProp', 'JsonProperties', 'LastMod', 'Model.Id', 'Origin', 'Parent', 'Pt3dProp',
                     'Rotation', 'TypeDefinition', 'UserLabel'].sort());
                 assert.equal(elemNew.$meta.isIndirectChange, false);
             }
-            catch (e_16) {
-                env_16.error = e_16;
-                env_16.hasError = true;
+            catch (e_17) {
+                env_17.error = e_17;
+                env_17.hasError = true;
             }
             finally {
-                __disposeResources(env_16);
+                __disposeResources(env_17);
             }
         }
     });
@@ -3364,12 +3339,11 @@ describe("ChangesetReader — openLocalChanges + openInmemoryChanges", () => {
             ],
         });
         txn.saveChanges("insert element");
-        // === openFile: insert changeset ===
         {
-            const env_17 = { stack: [], error: void 0, hasError: false };
+            const env_18 = { stack: [], error: void 0, hasError: false };
             try {
-                const reader = __addDisposableResource(env_17, ChangesetReader.openLocalChanges({ db: rwIModel, rowOptions: { abbreviateBlobs: false } }), false);
-                const pcu = __addDisposableResource(env_17, new PartialChangeUnifier(ChangeUnifierCache.createSqliteBackedCache()), false);
+                const reader = __addDisposableResource(env_18, ChangesetReader.openLocalChanges({ db: rwIModel, rowOptions: { abbreviateBlobs: false } }), false);
+                const pcu = __addDisposableResource(env_18, new PartialChangeUnifier(ChangeUnifierCache.createSqliteBackedCache()), false);
                 while (reader.step())
                     pcu.appendFrom(reader);
                 const instances = Array.from(pcu.instances);
@@ -3399,23 +3373,22 @@ describe("ChangesetReader — openLocalChanges + openInmemoryChanges", () => {
                 assert.deepEqual(Object.keys(elemNew).sort(), ["ECInstanceId", "ECClassId", "Model", "CodeSpec",
                     "CodeScope", "FederationGuid", "$meta", "Category", "LastMod",
                     "BinProp", "GuidArrProp"].sort());
-                assert.deepEqual([...elemNew.$meta.changeFetchedPropNames].sort(), ['BBoxHigh', 'BBoxLow', 'BinProp',
+                assert.deepEqual(elemNew.$meta.changeFetchedPropNames.sort(), ['BBoxHigh', 'BBoxLow', 'BinProp',
                     'Category.Id', 'CodeScope.Id', 'CodeSpec.Id', 'CodeValue',
                     'ECClassId', 'ECInstanceId', 'FederationGuid', 'GeometryStream', 'GuidArrProp',
                     'JsonProperties', 'LastMod', 'Model.Id', 'Origin', 'Parent', 'Pt3dProp', 'Rotation',
                     'TypeDefinition', 'UserLabel'].sort());
             }
-            catch (e_17) {
-                env_17.error = e_17;
-                env_17.hasError = true;
+            catch (e_18) {
+                env_18.error = e_18;
+                env_18.hasError = true;
             }
             finally {
-                __disposeResources(env_17);
+                __disposeResources(env_18);
             }
         }
         // Wait so that LastMod on bis_Model gets a distinct timestamp before the update txn
         await new Promise((resolve) => setTimeout(resolve, 300));
-        // --- Push 3: update element — change all custom props ---
         await rwIModel.locks.acquireLocks({ exclusive: elementId });
         txn.updateElement({
             ...rwIModel.elements.getElementProps(elementId),
@@ -3425,12 +3398,11 @@ describe("ChangesetReader — openLocalChanges + openInmemoryChanges", () => {
                 "ffffffff-0000-1111-2222-333344445555",
             ],
         });
-        // === openFile: update changeset ===
         {
-            const env_18 = { stack: [], error: void 0, hasError: false };
+            const env_19 = { stack: [], error: void 0, hasError: false };
             try {
-                const reader = __addDisposableResource(env_18, ChangesetReader.openInMemoryChanges({ db: rwIModel, rowOptions: { abbreviateBlobs: false } }), false);
-                const pcu = __addDisposableResource(env_18, new PartialChangeUnifier(ChangeUnifierCache.createSqliteBackedCache()), false);
+                const reader = __addDisposableResource(env_19, ChangesetReader.openInMemoryChanges({ db: rwIModel, rowOptions: { abbreviateBlobs: false } }), false);
+                const pcu = __addDisposableResource(env_19, new PartialChangeUnifier(ChangeUnifierCache.createSqliteBackedCache()), false);
                 while (reader.step())
                     pcu.appendFrom(reader);
                 const instances = Array.from(pcu.instances);
@@ -3452,7 +3424,7 @@ describe("ChangesetReader — openLocalChanges + openInmemoryChanges", () => {
                 assert.deepEqual(elemNew.BBoxHigh, { X: 0, Y: 0 });
                 assert.deepEqual(elemNew.Rotation, 0);
                 expect(elemNew.LastMod).to.exist;
-                assert.deepEqual([...elemNew.$meta.changeFetchedPropNames].sort(), ['BBoxHigh', 'BBoxLow', 'BinProp', 'ECInstanceId', 'GuidArrProp', 'LastMod', 'Origin', 'Pt3dProp', 'Rotation'].sort());
+                assert.deepEqual(elemNew.$meta.changeFetchedPropNames.sort(), ['BBoxHigh', 'BBoxLow', 'BinProp', 'ECInstanceId', 'GuidArrProp', 'LastMod', 'Origin', 'Pt3dProp', 'Rotation'].sort());
                 assert.equal(elemNew.$meta.isIndirectChange, false);
                 assert.equal(elemOld.$meta.op, "Updated");
                 assert.equal(elemOld.$meta.stage, "Old");
@@ -3466,25 +3438,22 @@ describe("ChangesetReader — openLocalChanges + openInmemoryChanges", () => {
                 ]);
                 expect(elemOld.LastMod).to.exist;
                 assert.equal(elemOld.$meta.isIndirectChange, false);
-                assert.deepEqual([...elemOld.$meta.changeFetchedPropNames].sort(), ['BBoxHigh', 'BBoxLow', 'BinProp', 'ECInstanceId', 'GuidArrProp', 'LastMod', 'Origin', 'Pt3dProp', 'Rotation'].sort());
+                assert.deepEqual(elemOld.$meta.changeFetchedPropNames.sort(), ['BBoxHigh', 'BBoxLow', 'BinProp', 'ECInstanceId', 'GuidArrProp', 'LastMod', 'Origin', 'Pt3dProp', 'Rotation'].sort());
             }
-            catch (e_18) {
-                env_18.error = e_18;
-                env_18.hasError = true;
+            catch (e_19) {
+                env_19.error = e_19;
+                env_19.hasError = true;
             }
             finally {
-                __disposeResources(env_18);
+                __disposeResources(env_19);
             }
         }
-        // === openGroup: insert + update as a single stream ===
-        // After merging, the elem New key is shared between insert-New and update-New;
-        // the update-New wins on overlapping props, so the final New reflects the updated state.
-        // elem Old only comes from the update changeset.
+        // === openLocalChanges: insert + update as a single stream so becomes insert ===
         {
-            const env_19 = { stack: [], error: void 0, hasError: false };
+            const env_20 = { stack: [], error: void 0, hasError: false };
             try {
-                const reader = __addDisposableResource(env_19, ChangesetReader.openLocalChanges({ db: rwIModel, includeInMemoryChanges: true, rowOptions: { abbreviateBlobs: false } }), false);
-                const pcu = __addDisposableResource(env_19, new PartialChangeUnifier(ChangeUnifierCache.createSqliteBackedCache()), false);
+                const reader = __addDisposableResource(env_20, ChangesetReader.openLocalChanges({ db: rwIModel, includeInMemoryChanges: true, rowOptions: { abbreviateBlobs: false } }), false);
+                const pcu = __addDisposableResource(env_20, new PartialChangeUnifier(ChangeUnifierCache.createSqliteBackedCache()), false);
                 while (reader.step())
                     pcu.appendFrom(reader);
                 const instances = Array.from(pcu.instances);
@@ -3517,19 +3486,19 @@ describe("ChangesetReader — openLocalChanges + openInmemoryChanges", () => {
                 assert.deepEqual(Object.keys(elemNew).sort(), ["ECInstanceId", "ECClassId", "Model", "CodeSpec",
                     "CodeScope", "FederationGuid", "$meta", "Category", "LastMod",
                     "BinProp", "GuidArrProp", "Origin", "Rotation", "BBoxLow", "BBoxHigh", "Pt3dProp"].sort());
-                assert.deepEqual([...elemNew.$meta.changeFetchedPropNames].sort(), ['BBoxHigh', 'BBoxLow',
+                assert.deepEqual(elemNew.$meta.changeFetchedPropNames.sort(), ['BBoxHigh', 'BBoxLow',
                     'BinProp', 'Category.Id', 'CodeScope.Id', 'CodeSpec.Id',
                     'CodeValue', 'ECClassId', 'ECInstanceId', 'FederationGuid', 'GeometryStream',
                     'GuidArrProp', 'JsonProperties', 'LastMod', 'Model.Id', 'Origin', 'Parent', 'Pt3dProp',
                     'Rotation', 'TypeDefinition', 'UserLabel'].sort());
                 assert.equal(elemNew.$meta.isIndirectChange, false);
             }
-            catch (e_19) {
-                env_19.error = e_19;
-                env_19.hasError = true;
+            catch (e_20) {
+                env_20.error = e_20;
+                env_20.hasError = true;
             }
             finally {
-                __disposeResources(env_19);
+                __disposeResources(env_20);
             }
         }
     });
@@ -3578,7 +3547,7 @@ describe("ChangesetReader: behaviour in case imodel is not in sync with changese
         HubMock.shutdown();
     });
     it("openFile() reads the middle changeset of an insert → update → delete lifecycle", async () => {
-        const env_20 = { stack: [], error: void 0, hasError: false };
+        const env_21 = { stack: [], error: void 0, hasError: false };
         try {
             const adminToken = "super manager token";
             // Push 2 (insert): insert element with category1
@@ -3626,8 +3595,8 @@ describe("ChangesetReader: behaviour in case imodel is not in sync with changese
             const changesets = await HubMock.downloadChangesets({ iModelId: rwIModelId, targetDir });
             expect(changesets.length).to.equal(4);
             const middleChangeset = changesets[Math.floor(changesets.length / 2)]; // index 2 = update
-            const reader = __addDisposableResource(env_20, ChangesetReader.openFile({ db: rwIModel, fileName: middleChangeset.pathname, propFilter: PropertyFilter.InstanceKey, rowOptions: { classIdsToClassNames: true } }), false);
-            const pcu = __addDisposableResource(env_20, new PartialChangeUnifier(ChangeUnifierCache.createInMemoryCache()), false);
+            const reader = __addDisposableResource(env_21, ChangesetReader.openFile({ db: rwIModel, fileName: middleChangeset.pathname, propFilter: PropertyFilter.InstanceKey, rowOptions: { classIdsToClassNames: true } }), false);
+            const pcu = __addDisposableResource(env_21, new PartialChangeUnifier(ChangeUnifierCache.createInMemoryCache()), false);
             while (reader.step())
                 pcu.appendFrom(reader);
             const instances = Array.from(pcu.instances);
@@ -3646,16 +3615,16 @@ describe("ChangesetReader: behaviour in case imodel is not in sync with changese
             expect(bisElementNew.map((i => i.ECClassId)).sort()).to.deep.equal(["BisCore.GeometricElement2d", "BisCore.Element"].sort());
             expect(bisElementOld.map((i => i.ECClassId)).sort()).to.deep.equal(["BisCore.GeometricElement2d", "BisCore.Element"].sort());
         }
-        catch (e_20) {
-            env_20.error = e_20;
-            env_20.hasError = true;
+        catch (e_21) {
+            env_21.error = e_21;
+            env_21.hasError = true;
         }
         finally {
-            __disposeResources(env_20);
+            __disposeResources(env_21);
         }
     });
     it("openTxn() reads the middle txn of an insert → update → update lifecycle", async () => {
-        const env_21 = { stack: [], error: void 0, hasError: false };
+        const env_22 = { stack: [], error: void 0, hasError: false };
         try {
             // Push 2 (insert): insert element with category1
             const geomArray = [
@@ -3697,8 +3666,8 @@ describe("ChangesetReader: behaviour in case imodel is not in sync with changese
                 s: { x: 100.0, y: 200.0 },
             });
             txn.saveChanges("update element");
-            const reader = __addDisposableResource(env_21, ChangesetReader.openTxn({ db: rwIModel, txnId }), false);
-            const pcu = __addDisposableResource(env_21, new PartialChangeUnifier(ChangeUnifierCache.createInMemoryCache()), false);
+            const reader = __addDisposableResource(env_22, ChangesetReader.openTxn({ db: rwIModel, txnId }), false);
+            const pcu = __addDisposableResource(env_22, new PartialChangeUnifier(ChangeUnifierCache.createInMemoryCache()), false);
             while (reader.step())
                 pcu.appendFrom(reader);
             const instances = Array.from(pcu.instances);
@@ -3720,12 +3689,12 @@ describe("ChangesetReader: behaviour in case imodel is not in sync with changese
             expect(elementOld.$meta.changeFetchedPropNames).to.include("s.X");
             expect(elementOld.$meta.changeFetchedPropNames).to.not.include("s.Y");
         }
-        catch (e_21) {
-            env_21.error = e_21;
-            env_21.hasError = true;
+        catch (e_22) {
+            env_22.error = e_22;
+            env_22.hasError = true;
         }
         finally {
-            __disposeResources(env_21);
+            __disposeResources(env_22);
         }
     });
 });
@@ -3808,7 +3777,7 @@ describe("ChangesetReader: overflow table graceful recovery when ExclusiveRootCl
         HubMock.shutdown();
     });
     it("openFile() recovers gracefully when ExclusiveRootClassId is NULL for overflow table", () => {
-        const env_22 = { stack: [], error: void 0, hasError: false };
+        const env_23 = { stack: [], error: void 0, hasError: false };
         try {
             /**
              * Simulate the broken state: clear ExclusiveRootClassId so the reader cannot
@@ -3818,7 +3787,7 @@ describe("ChangesetReader: overflow table graceful recovery when ExclusiveRootCl
              */
             expect(rwIModel[_nativeDb].executeSql("UPDATE ec_Table SET ExclusiveRootClassId=NULL WHERE Name='bis_GeometricElement2d_Overflow'")).to.equal(DbResult.BE_SQLITE_OK);
             let assertedOnOverflowTable = false;
-            const reader = __addDisposableResource(env_22, ChangesetReader.openFile({ db: rwIModel, fileName: updateChangesetPathname }), false);
+            const reader = __addDisposableResource(env_23, ChangesetReader.openFile({ db: rwIModel, fileName: updateChangesetPathname }), false);
             while (reader.step()) {
                 if (reader.tableName !== "bis_GeometricElement2d_Overflow")
                     continue;
@@ -3841,18 +3810,18 @@ describe("ChangesetReader: overflow table graceful recovery when ExclusiveRootCl
             }
             assert.isTrue(assertedOnOverflowTable, "Expected at least one row from the overflow table");
         }
-        catch (e_22) {
-            env_22.error = e_22;
-            env_22.hasError = true;
+        catch (e_23) {
+            env_23.error = e_23;
+            env_23.hasError = true;
         }
         finally {
-            __disposeResources(env_22);
+            __disposeResources(env_23);
         }
     });
 });
 describe("ChangesetReader: instance reused with a different class (class change in Updated row)", () => {
     it("openFile() correctly identifies ECClassId change from T1 to T2 in a buggy changeset", async () => {
-        const env_23 = { stack: [], error: void 0, hasError: false };
+        const env_24 = { stack: [], error: void 0, hasError: false };
         try {
             /**
              * Same scenario as ChangesetReader.test.ts: "Instance update to a different class (bug)".
@@ -3957,7 +3926,7 @@ describe("ChangesetReader: instance reused with a different class (class change
             // so it correctly sees T2 for the new (inserted) side and T1 for the old (deleted) side.
             let bisElementAsserted = false;
             let bisGeomElement2dAsserted = false;
-            const reader = __addDisposableResource(env_23, ChangesetReader.openFile({ db: b1, fileName: changesets[1].pathname }), false);
+            const reader = __addDisposableResource(env_24, ChangesetReader.openFile({ db: b1, fileName: changesets[1].pathname }), false);
             while (reader.step()) {
                 if (reader.tableName === "bis_Element" && reader.op === "Updated") {
                     bisElementAsserted = true;
@@ -3987,12 +3956,12 @@ describe("ChangesetReader: instance reused with a different class (class change
             b1.close();
             HubMock.shutdown();
         }
-        catch (e_23) {
-            env_23.error = e_23;
-            env_23.hasError = true;
+        catch (e_24) {
+            env_24.error = e_24;
+            env_24.hasError = true;
         }
         finally {
-            __disposeResources(env_23);
+            __disposeResources(env_24);
         }
     });
 });
@@ -4078,8 +4047,8 @@ describe("ChangesetReader: overflow table insert and update and delete", () => {
         assert.equal(updateModelNew.$meta.op, "Updated");
         assert.isString(updateModelNew.LastMod);
         assert.deepEqual(Object.keys(updateModelNew).sort(), ["ECInstanceId", "ECClassId", "LastMod", "$meta"].sort());
-        assert.deepEqual([...updateModelNew.$meta.tables], ["bis_Model"]);
-        assert.deepEqual([...updateModelNew.$meta.changeFetchedPropNames].sort(), ["ECInstanceId", "LastMod"].sort());
+        assert.deepEqual(updateModelNew.$meta.tables, ["bis_Model"]);
+        assert.deepEqual(updateModelNew.$meta.changeFetchedPropNames.sort(), ["ECInstanceId", "LastMod"].sort());
         assert.deepEqual(updateModelNew.$meta.rowOptions, { classIdsToClassNames: true });
         assert.equal(updateModelNew.$meta.isIndirectChange, true);
         // DrawingModel Updated Old
@@ -4088,8 +4057,8 @@ describe("ChangesetReader: overflow table insert and update and delete", () => {
         assert.equal(updateModelOld.$meta.op, "Updated");
         assert.isString(updateModelOld.LastMod);
         assert.deepEqual(Object.keys(updateModelOld).sort(), ["ECInstanceId", "ECClassId", "LastMod", "$meta"].sort());
-        assert.deepEqual([...updateModelOld.$meta.tables], ["bis_Model"]);
-        assert.deepEqual([...updateModelOld.$meta.changeFetchedPropNames].sort(), ["ECInstanceId", "LastMod"].sort());
+        assert.deepEqual(updateModelOld.$meta.tables, ["bis_Model"]);
+        assert.deepEqual(updateModelOld.$meta.changeFetchedPropNames.sort(), ["ECInstanceId", "LastMod"].sort());
         assert.equal(updateModelOld.$meta.isIndirectChange, true);
         // OverflowElement Updated New
         const elemNew = updateInstances.find((i) => i.ECInstanceId === elementId && i.$meta.stage === "New");
@@ -4099,10 +4068,10 @@ describe("ChangesetReader: overflow table insert and update and delete", () => {
         assert.equal(elemNew.$meta.isIndirectChange, false);
         assert.deepEqual(elemNew.$meta.rowOptions, { classIdsToClassNames: true });
         // Only bis_Element (LastMod) and bis_GeometricElement2d_Overflow (p34, p35) were touched
-        assert.deepEqual([...elemNew.$meta.tables].sort(), ["bis_Element", "bis_GeometricElement2d_Overflow"].sort());
-        assert.deepEqual([...elemNew.$meta.changeIndexes].sort(), [1, 2].sort());
+        assert.deepEqual(elemNew.$meta.tables.sort(), ["bis_Element", "bis_GeometricElement2d_Overflow"].sort());
+        assert.deepEqual(elemNew.$meta.changeIndexes.sort(), [1, 2].sort());
         // changeFetchedPropNames: only the props that changed
-        assert.deepEqual([...elemNew.$meta.changeFetchedPropNames].sort(), ["ECInstanceId", "LastMod", "p34", "p35"].sort());
+        assert.deepEqual(elemNew.$meta.changeFetchedPropNames.sort(), ["ECInstanceId", "LastMod", "p34", "p35"].sort());
         // New stage has updated values for the two overflow props
         assert.equal(elemNew[propName(34)], updateVal(34));
         assert.equal(elemNew[propName(35)], updateVal(35));
@@ -4115,8 +4084,8 @@ describe("ChangesetReader: overflow table insert and update and delete", () => {
         assert.equal(elemOld.ECClassId, "TestDomain.OverflowElement");
         assert.equal(elemOld.$meta.op, "Updated");
         assert.equal(elemOld.$meta.isIndirectChange, false);
-        assert.deepEqual([...elemOld.$meta.tables].sort(), ["bis_Element", "bis_GeometricElement2d_Overflow"].sort());
-        assert.deepEqual([...elemOld.$meta.changeFetchedPropNames].sort(), ["ECInstanceId", "LastMod", "p34", "p35"].sort());
+        assert.deepEqual(elemOld.$meta.tables.sort(), ["bis_Element", "bis_GeometricElement2d_Overflow"].sort());
+        assert.deepEqual(elemOld.$meta.changeFetchedPropNames.sort(), ["ECInstanceId", "LastMod", "p34", "p35"].sort());
         // Old stage has the pre-update (insert) values for the two overflow props
         assert.equal(elemOld[propName(34)], insertVal(34));
         assert.equal(elemOld[propName(35)], insertVal(35));
@@ -4131,8 +4100,8 @@ describe("ChangesetReader: overflow table insert and update and delete", () => {
         assert.equal(modelNew.$meta.op, "Updated");
         assert.isString(modelNew.LastMod);
         assert.isString(modelNew.GeometryGuid);
-        assert.deepEqual([...modelNew.$meta.tables], ["bis_Model"]);
-        assert.deepEqual([...modelNew.$meta.changeFetchedPropNames].sort(), ["ECInstanceId", "LastMod", "GeometryGuid"].sort());
+        assert.deepEqual(modelNew.$meta.tables, ["bis_Model"]);
+        assert.deepEqual(modelNew.$meta.changeFetchedPropNames.sort(), ["ECInstanceId", "LastMod", "GeometryGuid"].sort());
         assert.deepEqual(modelNew.$meta.rowOptions, { classIdsToClassNames: true });
         assert.equal(modelNew.$meta.isIndirectChange, true);
         // DrawingModel Updated Old
@@ -4140,7 +4109,7 @@ describe("ChangesetReader: overflow table insert and update and delete", () => {
         expect(modelOld).to.exist;
         assert.equal(modelOld.$meta.op, "Updated");
         assert.deepEqual(Object.keys(modelOld).sort(), ["ECInstanceId", "ECClassId", "$meta"].sort());
-        assert.deepEqual([...modelOld.$meta.tables], ["bis_Model"]);
+        assert.deepEqual(modelOld.$meta.tables, ["bis_Model"]);
         assert.equal(modelOld.$meta.isIndirectChange, true);
         // OverflowElement Inserted New — key assertions
         const insertElem = insertInstances.find((i) => i.ECInstanceId === elementId && i.$meta.stage === "New");
@@ -4151,10 +4120,10 @@ describe("ChangesetReader: overflow table insert and update and delete", () => {
         assert.equal(insertElem.$meta.isIndirectChange, false);
         assert.deepEqual(insertElem.$meta.rowOptions, { classIdsToClassNames: true });
         // All three physical tables (including overflow) contributed to this insert
-        assert.deepEqual([...insertElem.$meta.tables].sort(), ["bis_Element", "bis_GeometricElement2d", "bis_GeometricElement2d_Overflow"].sort());
-        assert.deepEqual([...insertElem.$meta.changeIndexes].sort(), [1, 2, 3].sort());
+        assert.deepEqual(insertElem.$meta.tables.sort(), ["bis_Element", "bis_GeometricElement2d", "bis_GeometricElement2d_Overflow"].sort());
+        assert.deepEqual(insertElem.$meta.changeIndexes.sort(), [1, 2, 3].sort());
         // changeFetchedPropNames includes all 36 domain props
-        const fetchedProps = [...insertElem.$meta.changeFetchedPropNames];
+        const fetchedProps = insertElem.$meta.changeFetchedPropNames;
         for (let i = 0; i < nProps; i++) {
             assert.include(fetchedProps, propName(i), `changeFetchedPropNames should contain p${i}`);
         }
@@ -4195,8 +4164,8 @@ describe("ChangesetReader: overflow table insert and update and delete", () => {
         assert.isString(updateModelNewForDelete.LastMod);
         assert.isString(updateModelNewForDelete.GeometryGuid);
         assert.deepEqual(Object.keys(updateModelNewForDelete).sort(), ["ECInstanceId", "ECClassId", "LastMod", "$meta", "GeometryGuid"].sort());
-        assert.deepEqual([...updateModelNewForDelete.$meta.tables], ["bis_Model"]);
-        assert.deepEqual([...updateModelNewForDelete.$meta.changeFetchedPropNames].sort(), ["ECInstanceId", "LastMod", "GeometryGuid"].sort());
+        assert.deepEqual(updateModelNewForDelete.$meta.tables, ["bis_Model"]);
+        assert.deepEqual(updateModelNewForDelete.$meta.changeFetchedPropNames.sort(), ["ECInstanceId", "LastMod", "GeometryGuid"].sort());
         assert.deepEqual(updateModelNewForDelete.$meta.rowOptions, { classIdsToClassNames: true });
         assert.equal(updateModelNewForDelete.$meta.isIndirectChange, true);
         // DrawingModel Updated Old
@@ -4206,8 +4175,8 @@ describe("ChangesetReader: overflow table insert and update and delete", () => {
         assert.isString(updateModelOldForDelete.LastMod);
         assert.isString(updateModelNewForDelete.GeometryGuid);
         assert.deepEqual(Object.keys(updateModelOldForDelete).sort(), ["ECInstanceId", "ECClassId", "LastMod", "$meta", "GeometryGuid"].sort());
-        assert.deepEqual([...updateModelOldForDelete.$meta.tables], ["bis_Model"]);
-        assert.deepEqual([...updateModelOldForDelete.$meta.changeFetchedPropNames].sort(), ["ECInstanceId", "LastMod", "GeometryGuid"].sort());
+        assert.deepEqual(updateModelOldForDelete.$meta.tables, ["bis_Model"]);
+        assert.deepEqual(updateModelOldForDelete.$meta.changeFetchedPropNames.sort(), ["ECInstanceId", "LastMod", "GeometryGuid"].sort());
         assert.equal(updateModelOldForDelete.$meta.isIndirectChange, true);
         // OverflowElement Deleted Old
         const deletedElemOld = deleteInstances.find((i) => i.ECInstanceId === elementId && i.$meta.stage === "Old");
@@ -4218,9 +4187,9 @@ describe("ChangesetReader: overflow table insert and update and delete", () => {
         assert.equal(deletedElemOld.$meta.isIndirectChange, false);
         assert.deepEqual(deletedElemOld.$meta.rowOptions, { classIdsToClassNames: true });
         // All three physical tables contributed to the delete row
-        assert.deepEqual([...deletedElemOld.$meta.tables].sort(), ["bis_Element", "bis_GeometricElement2d", "bis_GeometricElement2d_Overflow"].sort());
+        assert.deepEqual(deletedElemOld.$meta.tables.sort(), ["bis_Element", "bis_GeometricElement2d", "bis_GeometricElement2d_Overflow"].sort());
         // All 36 domain props are recorded in changeFetchedPropNames
-        const deleteFetchedProps = [...deletedElemOld.$meta.changeFetchedPropNames];
+        const deleteFetchedProps = deletedElemOld.$meta.changeFetchedPropNames;
         for (let i = 0; i < nProps; i++) {
             assert.include(deleteFetchedProps, propName(i), `changeFetchedPropNames should contain p${i}`);
         }
@@ -4286,23 +4255,25 @@ describe("ChangesetReader: invalid inputs", () => {
         expect(() => ChangesetReader.openFile({ db: iModel, fileName: KnownTestLocations.outputDir })).to.throw();
     });
     it("openFile: path points to a plain text file (not .changeset) throws", () => {
-        const env_24 = { stack: [], error: void 0, hasError: false };
+        const env_25 = { stack: [], error: void 0, hasError: false };
         try {
             const txtFile = path.join(KnownTestLocations.outputDir, "not_a_changeset.txt");
+            if (fs.existsSync(txtFile))
+                fs.unlinkSync(txtFile);
             // Write a small non-changeset file and expect the reader to reject it.
             fs.writeFileSync(txtFile, "this is not a changeset");
-            const reader = __addDisposableResource(env_24, ChangesetReader.openFile({ db: iModel, fileName: txtFile }), false);
+            const reader = __addDisposableResource(env_25, ChangesetReader.openFile({ db: iModel, fileName: txtFile }), false);
             assert.equal(reader.step(), false, "Expected step() to return false for an invalid changeset file");
             assert.equal(reader.step(), false, "Expected step() to return false for an invalid changeset file");
             assert.equal(reader.step(), false, "Expected step() to return false for an invalid changeset file");
             assert.equal(reader.step(), false, "Expected step() to return false for an invalid changeset file");
         }
-        catch (e_24) {
-            env_24.error = e_24;
-            env_24.hasError = true;
+        catch (e_25) {
+            env_25.error = e_25;
+            env_25.hasError = true;
         }
         finally {
-            __disposeResources(env_24);
+            __disposeResources(env_25);
         }
     });
     // --- openGroup ---
@@ -4322,17 +4293,17 @@ describe("ChangesetReader: invalid inputs", () => {
         // Passing the same changeset file twice is unusual but not necessarily an error at open time.
         // The reader should open and step without throwing; the caller is responsible for any semantic issues.
         expect(() => {
-            const env_25 = { stack: [], error: void 0, hasError: false };
+            const env_26 = { stack: [], error: void 0, hasError: false };
             try {
-                const reader = __addDisposableResource(env_25, ChangesetReader.openGroup({ db: iModel, changesetFiles: [validChangesetPath, validChangesetPath] }), false);
+                const reader = __addDisposableResource(env_26, ChangesetReader.openGroup({ db: iModel, changesetFiles: [validChangesetPath, validChangesetPath] }), false);
                 while (reader.step()) { /* drain */ }
             }
-            catch (e_25) {
-                env_25.error = e_25;
-                env_25.hasError = true;
+            catch (e_26) {
+                env_26.error = e_26;
+                env_26.hasError = true;
             }
             finally {
-                __disposeResources(env_25);
+                __disposeResources(env_26);
             }
         }).to.not.throw();
     });
@@ -4345,24 +4316,10 @@ describe("ChangesetReader: invalid inputs", () => {
     });
     // --- property accessors before step() ---
     it("accessing tableName before step() throws", () => {
-        const env_26 = { stack: [], error: void 0, hasError: false };
-        try {
-            const reader = __addDisposableResource(env_26, ChangesetReader.openFile({ db: iModel, fileName: validChangesetPath }), false);
-            expect(() => reader.tableName).to.throw();
-        }
-        catch (e_26) {
-            env_26.error = e_26;
-            env_26.hasError = true;
-        }
-        finally {
-            __disposeResources(env_26);
-        }
-    });
-    it("accessing isECTable before step() throws", () => {
         const env_27 = { stack: [], error: void 0, hasError: false };
         try {
             const reader = __addDisposableResource(env_27, ChangesetReader.openFile({ db: iModel, fileName: validChangesetPath }), false);
-            expect(() => reader.isECTable).to.throw();
+            expect(() => reader.tableName).to.throw();
         }
         catch (e_27) {
             env_27.error = e_27;
@@ -4372,11 +4329,11 @@ describe("ChangesetReader: invalid inputs", () => {
             __disposeResources(env_27);
         }
     });
-    it("accessing isIndirectChange before step() throws", () => {
+    it("accessing isECTable before step() throws", () => {
         const env_28 = { stack: [], error: void 0, hasError: false };
         try {
             const reader = __addDisposableResource(env_28, ChangesetReader.openFile({ db: iModel, fileName: validChangesetPath }), false);
-            expect(() => reader.isIndirectChange).to.throw();
+            expect(() => reader.isECTable).to.throw();
         }
         catch (e_28) {
             env_28.error = e_28;
@@ -4386,5 +4343,656 @@ describe("ChangesetReader: invalid inputs", () => {
             __disposeResources(env_28);
         }
     });
+    it("accessing isIndirectChange before step() throws", () => {
+        const env_29 = { stack: [], error: void 0, hasError: false };
+        try {
+            const reader = __addDisposableResource(env_29, ChangesetReader.openFile({ db: iModel, fileName: validChangesetPath }), false);
+            expect(() => reader.isIndirectChange).to.throw();
+        }
+        catch (e_29) {
+            env_29.error = e_29;
+            env_29.hasError = true;
+        }
+        finally {
+            __disposeResources(env_29);
+        }
+    });
+    it("openGroup: should throw if spillThresholdInBytes is negative", () => {
+        expect(() => {
+            ChangesetReader.openGroup({ db: iModel, changesetFiles: [validChangesetPath, validChangesetPath], spillThresholdInBytes: -1 });
+        }).to.throw();
+    });
+    it("openGroup: should throw if spillThresholdInBytes is extremely large", () => {
+        // 2**64 is a very large value, even 1 TB = 1024**4 bytes, but that is just around 2**40.
+        expect(() => {
+            ChangesetReader.openGroup({ db: iModel, changesetFiles: [validChangesetPath, validChangesetPath], spillThresholdInBytes: 2 ** 64 });
+        }).to.throw();
+    });
+});
+describe("ChangesetReader — spillThresholdInBytes (spill-to-disk)", () => {
+    const TEST_DOMAIN_SCHEMA = `<?xml version="1.0" encoding="UTF-8"?>
+  <ECSchema schemaName="TestDomain" alias="ts" version="01.00" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.1">
+      <ECSchemaReference name="BisCore" version="01.00" alias="bis"/>
+      <ECStructClass typeName="RichPoint" modifier="Sealed">
+          <ECProperty propertyName="X"     typeName="double"/>
+          <ECProperty propertyName="Y"     typeName="double"/>
+          <ECProperty propertyName="Z"     typeName="double"/>
+          <ECProperty propertyName="Label" typeName="string"/>
+          <ECProperty propertyName="Pt2d"  typeName="point2d"/>
+          <ECProperty propertyName="Pt3d"  typeName="point3d"/>
+      </ECStructClass>
+      <ECRelationshipClass typeName="Test2dUsesElement" strength="referencing" modifier="None">
+          <Source multiplicity="(0..*)" roleLabel="uses" polymorphic="true"><Class class="Test2dElement"/></Source>
+          <Target multiplicity="(0..1)" roleLabel="is used by" polymorphic="true"><Class class="bis:Element"/></Target>
+      </ECRelationshipClass>
+      <ECEntityClass typeName="Test2dElement">
+          <BaseClass>bis:GraphicalElement2d</BaseClass>
+          <ECProperty propertyName="StrProp"        typeName="string"/>
+          <ECProperty propertyName="IntProp"        typeName="int"/>
+          <ECProperty propertyName="LongProp"       typeName="long"/>
+          <ECProperty propertyName="DblProp"        typeName="double"/>
+          <ECProperty propertyName="BoolProp"       typeName="boolean"/>
+          <ECProperty propertyName="DtProp"         typeName="dateTime"/>
+          <ECProperty propertyName="BinProp"        typeName="binary"/>
+          <ECProperty propertyName="Pt2dProp"       typeName="point2d"/>
+          <ECProperty propertyName="Pt3dProp"       typeName="point3d"/>
+          <ECStructProperty      propertyName="StructProp"    typeName="RichPoint"/>
+          <ECArrayProperty       propertyName="IntArrProp"    typeName="int"       minOccurs="0" maxOccurs="unbounded"/>
+          <ECArrayProperty       propertyName="StrArrProp"    typeName="string"    minOccurs="0" maxOccurs="unbounded"/>
+          <ECStructArrayProperty propertyName="StructArrProp" typeName="RichPoint" minOccurs="0" maxOccurs="unbounded"/>
+          <ECNavigationProperty propertyName="RelatedElem" relationshipName="Test2dUsesElement" direction="forward"/>
+      </ECEntityClass>
+  </ECSchema>`;
+    /** Boots HubMock, opens a briefcase, starts a txn, and tears everything down after `fn` resolves or throws. */
+    async function withSpillTestIModel(hubName, iModelName, fn) {
+        HubMock.startup(hubName, KnownTestLocations.outputDir);
+        const adminToken = "super manager token";
+        const iTwinId = HubMock.iTwinId;
+        const iModelId = await HubMock.createNewIModel({ iTwinId, iModelName, description: iModelName, accessToken: adminToken });
+        const rwIModel = await HubWrappers.downloadAndOpenBriefcase({ iTwinId, iModelId, accessToken: adminToken });
+        const txn = startTestTxn(rwIModel, `ChangesetReader spill ${iModelName}`);
+        rwIModel.channels.addAllowedChannel(ChannelControl.sharedChannelName);
+        try {
+            await fn({ rwIModel, txn, iModelId, adminToken });
+        }
+        finally {
+            txn.end();
+            rwIModel.close();
+            HubMock.shutdown();
+        }
+    }
+    /** Imports TestDomain schema and pushes a drawing model + category as an initial setup changeset. Returns the ids. */
+    async function pushInitialModelSetup(ctx, catName) {
+        const { rwIModel, txn, adminToken } = ctx;
+        await importSchemaStrings(txn, [TEST_DOMAIN_SCHEMA]);
+        await rwIModel.locks.acquireLocks({ shared: IModel.dictionaryId });
+        const [, drawingModelId] = IModelTestUtils.createAndInsertDrawingPartitionAndModel(txn, Code.createEmpty(), true);
+        const drawingCategoryId = DrawingCategory.insert(txn, IModel.dictionaryId, catName, new SubCategoryAppearance({ color: ColorDef.fromString("rgb(0,128,255)").toJSON() }));
+        txn.saveChanges("setup");
+        await rwIModel.pushChanges({ description: "setup", accessToken: adminToken });
+        return { drawingModelId, drawingCategoryId };
+    }
+    /** Inserts a TestDomain:Test2dElement with all EC primitive types populated and returns its id. */
+    function insertTestElement(txn, drawingModelId, drawingCategoryId) {
+        const geom = [
+            Arc3d.createXY(Point3d.create(0, 0), 5),
+        ].map((a) => IModelJson.Writer.toIModelJson(a));
+        return txn.insertElement({
+            classFullName: "TestDomain:Test2dElement",
+            model: drawingModelId,
+            category: drawingCategoryId,
+            code: Code.createEmpty(),
+            geom,
+            StrProp: "hello",
+            IntProp: 42,
+            LongProp: 9_007_199_254_740_991,
+            DblProp: 3.14159265358979,
+            BoolProp: true,
+            DtProp: "2024-01-15T12:00:00.000",
+            BinProp: new Uint8Array([1, 2, 3, 4]),
+            Pt2dProp: { x: 1.5, y: 2.5 },
+            Pt3dProp: { x: 3.0, y: 4.0, z: 5.0 },
+            StructProp: {
+                X: 1.0, Y: 2.0, Z: 3.0, Label: "origin",
+                Pt2d: { x: 0.5, y: 0.5 },
+                Pt3d: { x: 1.0, y: 2.0, z: 3.0 },
+            },
+            IntArrProp: [10, 20, 30],
+            StrArrProp: ["alpha", "beta", "gamma"],
+            StructArrProp: [
+                { X: 0.0, Y: 1.0, Z: 2.0, Label: "a", Pt2d: { x: 0.0, y: 0.0 }, Pt3d: { x: 0.0, y: 0.0, z: 0.0 } },
+                { X: 3.0, Y: 4.0, Z: 5.0, Label: "b", Pt2d: { x: 1.0, y: 1.0 }, Pt3d: { x: 1.0, y: 1.0, z: 1.0 } },
+            ],
+            RelatedElem: { id: drawingCategoryId, relClassName: "TestDomain:Test2dUsesElement" },
+        });
+    }
+    /** Reads all instances from a reader using an in-memory unifier cache. */
+    function drainReader(reader) {
+        const env_30 = { stack: [], error: void 0, hasError: false };
+        try {
+            const pcu = __addDisposableResource(env_30, new PartialChangeUnifier(ChangeUnifierCache.createInMemoryCache()), false);
+            while (reader.step())
+                pcu.appendFrom(reader);
+            return Array.from(pcu.instances);
+        }
+        catch (e_30) {
+            env_30.error = e_30;
+            env_30.hasError = true;
+        }
+        finally {
+            __disposeResources(env_30);
+        }
+    }
+    /** Sorts instances by a stable key for deterministic deep-equality comparisons. */
+    function sortInstances(instances) {
+        return instances.slice().sort((a, b) => `${a.ECInstanceId}-${a.$meta.stage}`.localeCompare(`${b.ECInstanceId}-${b.$meta.stage}`));
+    }
+    /**
+     * Asserts that spill instances are non-empty, verifies the DrawingModel indirect-update fields
+     * and every field of each inserted Test2dElement one by one, then confirms the spill output is
+     * bit-for-bit identical to the default output.
+     */
+    function assertSpillEquivalence(iModel, defaultInstances, spillInstances, elementIds, drawingModelId, drawingCategoryId, isModelUpdated) {
+        expect(defaultInstances.length).to.be.greaterThan(0, "defaultInstances should be non-empty");
+        expect(spillInstances.length).to.be.greaterThan(0, "spillInstances should be non-empty");
+        if (isModelUpdated) {
+            // --- DrawingModel Updated New (indirect side-effect of element insert) ---
+            const modelNew = spillInstances.find((i) => i.ECInstanceId === drawingModelId && i.$meta.stage === "New");
+            expect(modelNew).to.exist;
+            assert.equal(modelNew.ECInstanceId, drawingModelId);
+            assert.equal(iModel.getClassNameFromId(modelNew.ECClassId), "BisCore:DrawingModel");
+            assert.isString(modelNew.LastMod);
+            assert.isString(modelNew.GeometryGuid);
+            assert.deepEqual(Object.keys(modelNew.$meta).sort(), ["op", "tables", "changeIndexes", "stage", "instanceKey", "propFilter", "changeFetchedPropNames", "isIndirectChange"].sort());
+            assert.equal(modelNew.$meta.op, "Updated");
+            assert.equal(modelNew.$meta.stage, "New");
+            assert.deepEqual(modelNew.$meta.tables, ["bis_Model"]);
+            expect(modelNew.$meta.changeIndexes.length).to.be.greaterThan(0);
+            assert.isString(modelNew.$meta.instanceKey);
+            assert.equal(modelNew.$meta.instanceKey.split("-").length, 2);
+            assert.equal(modelNew.$meta.propFilter, PropertyFilter.All);
+            assert.deepEqual(modelNew.$meta.changeFetchedPropNames.slice().sort(), ["ECInstanceId", "LastMod", "GeometryGuid"].sort());
+            assert.equal(modelNew.$meta.isIndirectChange, true);
+            // --- DrawingModel Updated Old ---
+            const modelOld = spillInstances.find((i) => i.ECInstanceId === drawingModelId && i.$meta.stage === "Old");
+            expect(modelOld).to.exist;
+            assert.equal(modelOld.ECInstanceId, drawingModelId);
+            assert.equal(iModel.getClassNameFromId(modelOld.ECClassId), "BisCore:DrawingModel");
+            assert.deepEqual(Object.keys(modelOld.$meta).sort(), ["op", "tables", "changeIndexes", "stage", "instanceKey", "propFilter", "changeFetchedPropNames", "isIndirectChange"].sort());
+            assert.equal(modelOld.$meta.op, "Updated");
+            assert.equal(modelOld.$meta.stage, "Old");
+            assert.deepEqual(modelOld.$meta.tables, ["bis_Model"]);
+            expect(modelOld.$meta.changeIndexes.length).to.be.greaterThan(0);
+            assert.isString(modelOld.$meta.instanceKey);
+            assert.equal(modelOld.$meta.instanceKey.split("-").length, 2);
+            assert.equal(modelOld.$meta.propFilter, PropertyFilter.All);
+            assert.deepEqual(modelOld.$meta.changeFetchedPropNames.slice().sort(), ["ECInstanceId", "LastMod", "GeometryGuid"].sort());
+            assert.equal(modelOld.$meta.isIndirectChange, true);
+        }
+        // --- Test2dElement Inserted New — assert every field for each inserted element ---
+        for (const elementId of elementIds) {
+            const elem = spillInstances.find((i) => i.ECInstanceId === elementId && i.$meta.stage === "New");
+            expect(elem).to.exist;
+            assert.equal(elem.ECInstanceId, elementId);
+            assert.equal(iModel.getClassNameFromId(elem.ECClassId), "TestDomain:Test2dElement");
+            assert.equal(elem.Model.Id, drawingModelId);
+            assert.equal(iModel.getClassNameFromId(elem.Model.RelECClassId), "BisCore:ModelContainsElements");
+            assert.isString(elem.LastMod);
+            assert.equal(elem.CodeSpec.Id, "0x1");
+            assert.equal(iModel.getClassNameFromId(elem.CodeSpec.RelECClassId), "BisCore:CodeSpecSpecifiesCode");
+            assert.equal(elem.CodeScope.Id, "0x1");
+            assert.equal(iModel.getClassNameFromId(elem.CodeScope.RelECClassId), "BisCore:ElementScopesCode");
+            assert.isString(elem.FederationGuid);
+            assert.equal(elem.Category.Id, drawingCategoryId);
+            assert.equal(iModel.getClassNameFromId(elem.Category.RelECClassId), "BisCore:GeometricElement2dIsInCategory");
+            assert.deepEqual(elem.Origin, { X: 0, Y: 0 });
+            assert.equal(elem.Rotation, 0);
+            assert.deepEqual(elem.BBoxLow, { X: -5, Y: -5 });
+            assert.deepEqual(elem.BBoxHigh, { X: 5, Y: 5 });
+            assert.include(String(elem.GeometryStream), "\"bytes\"");
+            assert.include(String(elem.BinProp), "\"bytes\"");
+            assert.equal(elem.StrProp, "hello");
+            assert.equal(elem.IntProp, 42);
+            assert.equal(elem.LongProp, 9007199254740991);
+            assert.closeTo(elem.DblProp, 3.14159265358979, 1e-10);
+            assert.equal(elem.BoolProp, true);
+            assert.equal(elem.DtProp, "2024-01-15T12:00:00.000");
+            assert.deepEqual(elem.Pt2dProp, { X: 1.5, Y: 2.5 });
+            assert.deepEqual(elem.Pt3dProp, { X: 3, Y: 4, Z: 5 });
+            assert.deepEqual(elem.StructProp, { X: 1, Y: 2, Z: 3, Label: "origin", Pt2d: { X: 0.5, Y: 0.5 }, Pt3d: { X: 1, Y: 2, Z: 3 } });
+            assert.deepEqual(elem.IntArrProp, [10, 20, 30]);
+            assert.deepEqual(elem.StrArrProp, ["alpha", "beta", "gamma"]);
+            assert.deepEqual(elem.StructArrProp, [
+                { X: 0, Y: 1, Z: 2, Label: "a", Pt2d: { X: 0, Y: 0 }, Pt3d: { X: 0, Y: 0, Z: 0 } },
+                { X: 3, Y: 4, Z: 5, Label: "b", Pt2d: { X: 1, Y: 1 }, Pt3d: { X: 1, Y: 1, Z: 1 } },
+            ]);
+            assert.equal(elem.RelatedElem.Id, drawingCategoryId);
+            assert.equal(iModel.getClassNameFromId(elem.RelatedElem.RelECClassId), "TestDomain:Test2dUsesElement");
+            assert.deepEqual(Object.keys(elem.$meta).sort(), ["op", "tables", "changeIndexes", "stage", "instanceKey", "propFilter", "changeFetchedPropNames", "isIndirectChange"].sort());
+            assert.equal(elem.$meta.op, "Inserted");
+            assert.equal(elem.$meta.stage, "New");
+            assert.deepEqual(elem.$meta.tables.slice().sort(), ["bis_Element", "bis_GeometricElement2d"].sort());
+            expect(elem.$meta.changeIndexes.length).to.be.greaterThan(0);
+            assert.isString(elem.$meta.instanceKey);
+            assert.equal(elem.$meta.instanceKey.split("-").length, 2);
+            assert.equal(elem.$meta.propFilter, PropertyFilter.All);
+            assert.deepEqual(elem.$meta.changeFetchedPropNames.slice().sort(), [
+                "BBoxHigh", "BBoxLow", "BinProp", "BoolProp", "Category.Id", "CodeScope.Id",
+                "CodeSpec.Id", "CodeValue", "DblProp", "DtProp", "ECClassId", "ECInstanceId",
+                "FederationGuid", "GeometryStream", "IntArrProp", "IntProp", "JsonProperties",
+                "LastMod", "LongProp", "Model.Id", "Origin", "Parent", "Pt2dProp", "Pt3dProp",
+                "RelatedElem", "Rotation", "StrArrProp", "StrProp", "StructArrProp", "StructProp.Label",
+                "StructProp.Pt2d", "StructProp.Pt3d", "StructProp.X", "StructProp.Y", "StructProp.Z",
+                "TypeDefinition", "UserLabel",
+            ].sort());
+            assert.equal(elem.$meta.isIndirectChange, false);
+        }
+        // --- spill output must exactly match default output ---
+        assert.deepEqual(sortInstances(spillInstances), sortInstances(defaultInstances));
+    }
+    // ---- openGroup ----
+    it("openGroup: spillThresholdInBytes = 1 (forces disk spill) yields same instances as default", async () => {
+        await withSpillTestIModel("ECChangesetSpillGroup", "spillGroup", async (ctx) => {
+            const { rwIModel, txn, iModelId, adminToken } = ctx;
+            const { drawingModelId, drawingCategoryId } = await pushInitialModelSetup(ctx, "SpillGroupCat");
+            // Wait so that LastMod on bis_Model gets a distinct timestamp before the insert txn
+            await new Promise((resolve) => setTimeout(resolve, 300));
+            await rwIModel.locks.acquireLocks({ shared: drawingModelId });
+            // Push 1: insert element 1
+            const element1Id = insertTestElement(txn, drawingModelId, drawingCategoryId);
+            txn.saveChanges("insert element 1");
+            await rwIModel.pushChanges({ description: "changeset 1: element 1", accessToken: adminToken });
+            await rwIModel.locks.acquireLocks({ shared: drawingModelId });
+            // Push 2: insert element 2
+            const element2Id = insertTestElement(txn, drawingModelId, drawingCategoryId);
+            txn.saveChanges("insert element 2");
+            await rwIModel.pushChanges({ description: "changeset 2: element 2", accessToken: adminToken });
+            const targetDir = path.join(KnownTestLocations.outputDir, iModelId, "changesets");
+            const changesets = await HubMock.downloadChangesets({ iModelId, targetDir });
+            assert.equal(changesets.length, 3);
+            const changesetPaths = changesets.slice(1).map((cs) => cs.pathname); // The insert element changesets are the 2nd and 3rd changesets (1st is the initial setup)
+            assertSpillEquivalence(rwIModel, drainReader(ChangesetReader.openGroup({ db: rwIModel, changesetFiles: changesetPaths })), drainReader(ChangesetReader.openGroup({ db: rwIModel, changesetFiles: changesetPaths, spillThresholdInBytes: 1 })), [element1Id, element2Id], drawingModelId, drawingCategoryId, true);
+        });
+    });
+    // ---- openTxn ----
+    it("openTxn: spillThresholdInBytes = 1 (forces disk spill) yields same instances as default", async () => {
+        await withSpillTestIModel("ECChangesetSpillTxn", "spillTxn", async (ctx) => {
+            const { rwIModel, txn } = ctx;
+            const { drawingModelId, drawingCategoryId } = await pushInitialModelSetup(ctx, "SpillTxnCat");
+            await rwIModel.locks.acquireLocks({ shared: drawingModelId });
+            // Txn 1: insert element 1 (an earlier local txn)
+            insertTestElement(txn, drawingModelId, drawingCategoryId);
+            txn.saveChanges("insert element 1");
+            // Txn 2: insert element 2 — the last txn, whose id is used for openTxn
+            const element2Id = insertTestElement(txn, drawingModelId, drawingCategoryId);
+            txn.saveChanges("insert element 2");
+            const lastTxnId = rwIModel.txns.getLastSavedTxnProps().id;
+            assertSpillEquivalence(rwIModel, drainReader(ChangesetReader.openTxn({ db: rwIModel, txnId: lastTxnId })), drainReader(ChangesetReader.openTxn({ db: rwIModel, txnId: lastTxnId, spillThresholdInBytes: 1 })), [element2Id], drawingModelId, drawingCategoryId, false);
+        });
+    });
+    // ---- openLocalChanges ----
+    it("openLocalChanges: spillThresholdInBytes = 1 (forces disk spill) yields same instances as default", async () => {
+        await withSpillTestIModel("ECChangesetSpillLocal", "spillLocal", async (ctx) => {
+            const { rwIModel, txn } = ctx;
+            const { drawingModelId, drawingCategoryId } = await pushInitialModelSetup(ctx, "SpillLocalCat");
+            // Wait so that LastMod on bis_Model gets a distinct timestamp before the insert txn
+            await new Promise((resolve) => setTimeout(resolve, 300));
+            await rwIModel.locks.acquireLocks({ shared: drawingModelId });
+            // Local txn 1: saved but not pushed
+            const element1Id = insertTestElement(txn, drawingModelId, drawingCategoryId);
+            txn.saveChanges("local insert 1");
+            // Local txn 2: saved but not pushed
+            const element2Id = insertTestElement(txn, drawingModelId, drawingCategoryId);
+            txn.saveChanges("local insert 2");
+            assertSpillEquivalence(rwIModel, drainReader(ChangesetReader.openLocalChanges({ db: rwIModel })), drainReader(ChangesetReader.openLocalChanges({ db: rwIModel, spillThresholdInBytes: 1 })), [element1Id, element2Id], drawingModelId, drawingCategoryId, true);
+        });
+    });
+    // ---- openInMemoryChanges ----
+    it("openInMemoryChanges: spillThresholdInBytes = 1 (forces disk spill) yields same instances as default", async () => {
+        await withSpillTestIModel("ECChangesetSpillInMemory", "spillInMemory", async (ctx) => {
+            const { rwIModel, txn } = ctx;
+            const { drawingModelId, drawingCategoryId } = await pushInitialModelSetup(ctx, "SpillInMemoryCat");
+            await rwIModel.locks.acquireLocks({ shared: drawingModelId });
+            // Insert without saveChanges — read raw in-memory changes
+            const elementId = insertTestElement(txn, drawingModelId, drawingCategoryId);
+            assertSpillEquivalence(rwIModel, drainReader(ChangesetReader.openInMemoryChanges({ db: rwIModel })), drainReader(ChangesetReader.openInMemoryChanges({ db: rwIModel, spillThresholdInBytes: 1 })), [elementId], drawingModelId, drawingCategoryId, false // saveChanges is not called, so DrawingModel should not be updated and thus no indirect changes
+            );
+        });
+    });
+});
+describe("ChangesetReader: strict mode (column-count mismatch)", () => {
+    const STRICT_MODE_SCHEMA_V1 = `<?xml version="1.0" encoding="UTF-8"?>
+  <ECSchema schemaName="TestDomain" alias="ts" version="01.00" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.1">
+      <ECSchemaReference name="BisCore" version="01.00" alias="bis"/>
+      <ECEntityClass typeName="SimpleElement">
+          <BaseClass>bis:GraphicalElement2d</BaseClass>
+          <ECProperty propertyName="p1" typeName="string"/>
+          <ECProperty propertyName="p2" typeName="string"/>
+      </ECEntityClass>
+  </ECSchema>`;
+    const STRICT_MODE_SCHEMA_V2 = `<?xml version="1.0" encoding="UTF-8"?>
+  <ECSchema schemaName="TestDomain" alias="ts" version="01.01" xmlns="http://www.bentley.com/schemas/Bentley.ECXML.3.1">
+      <ECSchemaReference name="BisCore" version="01.00" alias="bis"/>
+      <ECEntityClass typeName="SimpleElement">
+          <BaseClass>bis:GraphicalElement2d</BaseClass>
+          <ECProperty propertyName="p1" typeName="string"/>
+          <ECProperty propertyName="p2" typeName="string"/>
+          <ECProperty propertyName="p3" typeName="string"/>
+          <ECProperty propertyName="p4" typeName="string"/>
+      </ECEntityClass>
+  </ECSchema>`;
+    it("openTxn: strict mode ON throws when txn was captured with fewer columns than the current live table, strict mode OFF does not throw", async () => {
+        HubMock.startup("StrictModeOldTxnStrict", KnownTestLocations.outputDir);
+        const adminToken = "super manager token";
+        const iTwinId = HubMock.iTwinId;
+        const iModelId = await HubMock.createNewIModel({ iTwinId, iModelName: "strictOldTxn", description: "strict", accessToken: adminToken });
+        const db = await HubWrappers.downloadAndOpenBriefcase({ iTwinId, iModelId, accessToken: adminToken });
+        const txn = startTestTxn(db, "strict mode scenario 1 strict");
+        db.channels.addAllowedChannel(ChannelControl.sharedChannelName);
+        try {
+            // Setup: v1 schema + drawing model + category
+            await importSchemaStrings(txn, [STRICT_MODE_SCHEMA_V1]);
+            await db.locks.acquireLocks({ shared: IModel.dictionaryId });
+            const [, modelId] = IModelTestUtils.createAndInsertDrawingPartitionAndModel(txn, Code.createEmpty(), true);
+            const catId = DrawingCategory.insert(txn, IModel.dictionaryId, "Cat", new SubCategoryAppearance({ color: ColorDef.fromString("rgb(128,0,128)").toJSON() }));
+            txn.saveChanges("setup");
+            await db.pushChanges({ description: "setup", accessToken: adminToken });
+            // Wait so that LastMod on bis_Model gets a distinct timestamp before the insert txn
+            await new Promise((resolve) => setTimeout(resolve, 300));
+            await db.locks.acquireLocks({ shared: modelId });
+            const geom = [Arc3d.createXY(Point3d.create(0, 0), 5)].map((a) => IModelJson.Writer.toIModelJson(a));
+            const elementId = txn.insertElement({ classFullName: "TestDomain:SimpleElement", model: modelId, category: catId, code: Code.createEmpty(), geom, p1: "hello", p2: "world" });
+            txn.saveChanges("insert v1 element");
+            const txnId = db.txns.getLastSavedTxnProps().id;
+            // Upgrade schema to v2 — appends one column in the live DB.
+            await importSchemaStrings(txn, [STRICT_MODE_SCHEMA_V2]);
+            // Strict mode ON: binary has one column less than the live table.
+            {
+                const env_31 = { stack: [], error: void 0, hasError: false };
+                try {
+                    const reader = __addDisposableResource(env_31, ChangesetReader.openTxn({ db, txnId }), false);
+                    reader.enableStrictMode();
+                    expect(() => { while (reader.step()) { /* drain */ } }).to.throw();
+                }
+                catch (e_31) {
+                    env_31.error = e_31;
+                    env_31.hasError = true;
+                }
+                finally {
+                    __disposeResources(env_31);
+                }
+            }
+            {
+                const env_32 = { stack: [], error: void 0, hasError: false };
+                try {
+                    const reader = __addDisposableResource(env_32, ChangesetReader.openTxn({ db, txnId }), false);
+                    reader.disableStrictMode(); // no-op when already off — verifies the API does not throw
+                    const pcu = __addDisposableResource(env_32, new PartialChangeUnifier(ChangeUnifierCache.createInMemoryCache()), false);
+                    while (reader.step())
+                        pcu.appendFrom(reader);
+                    const instances = Array.from(pcu.instances);
+                    assert.equal(instances.length, 3, "should have 3 change instances: model (New + Old) + element (New)");
+                    // --- Model indirect update — New stage ---
+                    const modelNew = instances.find((i) => i.ECInstanceId === modelId && i.$meta.stage === "New");
+                    expect(modelNew).to.exist;
+                    assert.equal(modelNew.ECInstanceId, modelId);
+                    assert.equal(db.getClassNameFromId(modelNew.ECClassId), "BisCore:DrawingModel");
+                    assert.isString(modelNew.LastMod);
+                    assert.isString(modelNew.GeometryGuid);
+                    assert.deepEqual(Object.keys(modelNew).sort(), ["ECInstanceId", "ECClassId", "LastMod", "GeometryGuid", "$meta"].sort());
+                    assert.deepEqual(Object.keys(modelNew.$meta).sort(), ["op", "tables", "changeIndexes", "stage", "instanceKey", "propFilter", "changeFetchedPropNames", "isIndirectChange"].sort());
+                    assert.equal(modelNew.$meta.op, "Updated");
+                    assert.equal(modelNew.$meta.stage, "New");
+                    assert.deepEqual(modelNew.$meta.tables, ["bis_Model"]);
+                    assert.deepEqual(modelNew.$meta.changeIndexes, [3]);
+                    assert.isString(modelNew.$meta.instanceKey);
+                    assert.equal(modelNew.$meta.instanceKey.split("-").length, 2);
+                    assert.equal(modelNew.$meta.propFilter, PropertyFilter.All);
+                    assert.deepEqual(modelNew.$meta.changeFetchedPropNames.sort(), ["ECInstanceId", "LastMod", "GeometryGuid"].sort());
+                    assert.equal(modelNew.$meta.isIndirectChange, true);
+                    // --- Model indirect update — Old stage (only key columns, no data properties) ---
+                    const modelOld = instances.find((i) => i.ECInstanceId === modelId && i.$meta.stage === "Old");
+                    expect(modelOld).to.exist;
+                    assert.equal(modelOld.ECInstanceId, modelId);
+                    assert.equal(db.getClassNameFromId(modelOld.ECClassId), "BisCore:DrawingModel");
+                    assert.isUndefined(modelOld.LastMod, "Old stage carries only the key — no data properties");
+                    assert.isUndefined(modelOld.GeometryGuid, "Old stage carries only the key — no data properties");
+                    assert.deepEqual(Object.keys(modelOld).sort(), ["ECInstanceId", "ECClassId", "$meta"].sort());
+                    assert.deepEqual(Object.keys(modelOld.$meta).sort(), ["op", "tables", "changeIndexes", "stage", "instanceKey", "propFilter", "changeFetchedPropNames", "isIndirectChange"].sort());
+                    assert.equal(modelOld.$meta.op, "Updated");
+                    assert.equal(modelOld.$meta.stage, "Old");
+                    assert.deepEqual(modelOld.$meta.tables, ["bis_Model"]);
+                    assert.deepEqual(modelOld.$meta.changeIndexes, [3]);
+                    assert.isString(modelOld.$meta.instanceKey);
+                    assert.equal(modelOld.$meta.instanceKey.split("-").length, 2);
+                    assert.equal(modelOld.$meta.propFilter, PropertyFilter.All);
+                    assert.deepEqual(modelOld.$meta.changeFetchedPropNames.sort(), ["ECInstanceId", "LastMod", "GeometryGuid"].sort());
+                    assert.equal(modelOld.$meta.isIndirectChange, true);
+                    // --- Element insert — New stage ---
+                    const elemNew = instances.find((i) => i.ECInstanceId === elementId && i.$meta.stage === "New");
+                    expect(elemNew).to.exist;
+                    assert.equal(elemNew.ECInstanceId, elementId);
+                    assert.equal(db.getClassNameFromId(elemNew.ECClassId), "TestDomain:SimpleElement");
+                    assert.equal(elemNew.Model.Id, modelId);
+                    assert.equal(db.getClassNameFromId(elemNew.Model.RelECClassId), "BisCore:ModelContainsElements");
+                    assert.isString(elemNew.LastMod);
+                    assert.equal(elemNew.CodeSpec.Id, "0x1");
+                    assert.equal(db.getClassNameFromId(elemNew.CodeSpec.RelECClassId), "BisCore:CodeSpecSpecifiesCode");
+                    assert.equal(elemNew.CodeScope.Id, "0x1");
+                    assert.equal(db.getClassNameFromId(elemNew.CodeScope.RelECClassId), "BisCore:ElementScopesCode");
+                    assert.isString(elemNew.FederationGuid);
+                    assert.equal(elemNew.Category.Id, catId);
+                    assert.equal(db.getClassNameFromId(elemNew.Category.RelECClassId), "BisCore:GeometricElement2dIsInCategory");
+                    assert.deepEqual(elemNew.Origin, { X: 0, Y: 0 });
+                    assert.equal(elemNew.Rotation, 0);
+                    assert.deepEqual(elemNew.BBoxLow, { X: -5, Y: -5 });
+                    assert.deepEqual(elemNew.BBoxHigh, { X: 5, Y: 5 });
+                    assert.include(String(elemNew.GeometryStream), "\"bytes\"");
+                    assert.equal(elemNew.p1, "hello", "p1 from the txn binary must be readable in lenient mode");
+                    assert.equal(elemNew.p2, "world", "p2 from the txn binary must be readable in lenient mode");
+                    // Object.keys — p3 is absent because the txn binary predates the v2 schema upgrade
+                    assert.deepEqual(Object.keys(elemNew).sort(), [
+                        "ECInstanceId", "ECClassId", "Model", "LastMod", "CodeSpec", "CodeScope",
+                        "FederationGuid", "Category", "Origin", "Rotation", "BBoxLow", "BBoxHigh",
+                        "GeometryStream", "p1", "p2", "$meta",
+                    ].sort());
+                    // $meta keys
+                    assert.deepEqual(Object.keys(elemNew.$meta).sort(), ["op", "tables", "changeIndexes", "stage", "instanceKey", "propFilter", "changeFetchedPropNames", "isIndirectChange"].sort());
+                    assert.equal(elemNew.$meta.op, "Inserted");
+                    assert.equal(elemNew.$meta.stage, "New");
+                    assert.deepEqual(elemNew.$meta.tables.sort(), ["bis_Element", "bis_GeometricElement2d"].sort());
+                    assert.deepEqual(elemNew.$meta.changeIndexes.sort(), [1, 2].sort());
+                    assert.isString(elemNew.$meta.instanceKey);
+                    assert.equal(elemNew.$meta.instanceKey.split("-").length, 2);
+                    assert.equal(elemNew.$meta.propFilter, PropertyFilter.All);
+                    assert.deepEqual(elemNew.$meta.changeFetchedPropNames.sort(), [
+                        "ECInstanceId", "ECClassId", "Model.Id", "LastMod", "CodeSpec.Id", "CodeScope.Id",
+                        "CodeValue", "UserLabel", "Parent", "FederationGuid", "JsonProperties",
+                        "Category.Id", "Origin", "Rotation", "BBoxLow", "BBoxHigh", "GeometryStream",
+                        "TypeDefinition", "p1", "p2",
+                    ].sort());
+                    assert.equal(elemNew.$meta.isIndirectChange, false);
+                }
+                catch (e_32) {
+                    env_32.error = e_32;
+                    env_32.hasError = true;
+                }
+                finally {
+                    __disposeResources(env_32);
+                }
+            }
+        }
+        finally {
+            txn.end();
+            db.close();
+            HubMock.shutdown();
+        }
+    });
+    it("openFile: strict mode ON throws when changeset was created with more columns than the live table", async () => {
+        HubMock.startup("StrictModeNewCsStrict", KnownTestLocations.outputDir);
+        const adminToken = "super manager token";
+        const iTwinId = HubMock.iTwinId;
+        const iModelId = await HubMock.createNewIModel({ iTwinId, iModelName: "strictNewCs", description: "strict", accessToken: adminToken });
+        const b1 = await HubWrappers.downloadAndOpenBriefcase({ iTwinId, iModelId, accessToken: adminToken });
+        const txn1 = startTestTxn(b1, "strict mode b1 strict");
+        b1.channels.addAllowedChannel(ChannelControl.sharedChannelName);
+        try {
+            // Push 1 (B1): v1 schema + drawing model + category.
+            await importSchemaStrings(txn1, [STRICT_MODE_SCHEMA_V1]);
+            await b1.locks.acquireLocks({ shared: IModel.dictionaryId });
+            const [, modelId] = IModelTestUtils.createAndInsertDrawingPartitionAndModel(txn1, Code.createEmpty(), true);
+            const catId = DrawingCategory.insert(txn1, IModel.dictionaryId, "Cat", new SubCategoryAppearance({ color: ColorDef.fromString("rgb(128,0,128)").toJSON() }));
+            txn1.saveChanges("setup");
+            await b1.pushChanges({ description: "setup", accessToken: adminToken });
+            let elementId;
+            // B2: open iModel (picks up B1's v1 schema + model + category), upgrade to v2, insert element, push.
+            {
+                const b2 = await HubWrappers.downloadAndOpenBriefcase({ iTwinId, iModelId, accessToken: adminToken });
+                const txn2 = startTestTxn(b2, "strict mode b2 strict");
+                b2.channels.addAllowedChannel(ChannelControl.sharedChannelName);
+                try {
+                    // Push 2 (B2): upgrade schema to v2 (appends a column).
+                    await importSchemaStrings(txn2, [STRICT_MODE_SCHEMA_V2]);
+                    await b2.pushChanges({ description: "schema v2", accessToken: adminToken });
+                    // Wait so that LastMod on bis_Model gets a distinct timestamp before the insert txn
+                    await new Promise((resolve) => setTimeout(resolve, 50));
+                    // Push 3 (B2): insert element.
+                    await b2.locks.acquireLocks({ shared: modelId });
+                    const geom = [Arc3d.createXY(Point3d.create(0, 0), 5)].map((a) => IModelJson.Writer.toIModelJson(a));
+                    elementId = txn2.insertElement({ classFullName: "TestDomain:SimpleElement", model: modelId, category: catId, code: Code.createEmpty(), geom, p1: "hi", p2: "world", p3: "!", p4: "?" });
+                    txn2.saveChanges("insert v2 element");
+                    await b2.pushChanges({ description: "insert v2 element", accessToken: adminToken });
+                }
+                finally {
+                    txn2.end();
+                    b2.close();
+                }
+            }
+            // Download all changesets. The last one is B2's element insert.
+            const targetDir = path.join(KnownTestLocations.outputDir, iModelId, "changesets");
+            const changesets = await HubMock.downloadChangesets({ iModelId, targetDir });
+            const newCs = changesets[changesets.length - 1];
+            // Strict mode ON: binary has more cols, throws.
+            {
+                const env_33 = { stack: [], error: void 0, hasError: false };
+                try {
+                    const reader = __addDisposableResource(env_33, ChangesetReader.openFile({ db: b1, fileName: newCs.pathname }), false);
+                    reader.enableStrictMode();
+                    expect(() => { while (reader.step()) { /* drain */ } }).to.throw();
+                }
+                catch (e_33) {
+                    env_33.error = e_33;
+                    env_33.hasError = true;
+                }
+                finally {
+                    __disposeResources(env_33);
+                }
+            }
+            // Strict mode OFF: binary has more cols, does not throw.
+            {
+                const env_34 = { stack: [], error: void 0, hasError: false };
+                try {
+                    const reader = __addDisposableResource(env_34, ChangesetReader.openFile({ db: b1, fileName: newCs.pathname }), false);
+                    const pcu = __addDisposableResource(env_34, new PartialChangeUnifier(ChangeUnifierCache.createInMemoryCache()), false);
+                    while (reader.step())
+                        pcu.appendFrom(reader);
+                    const instances = Array.from(pcu.instances);
+                    assert.equal(instances.length, 3, "should have 3 change instances: model (New + Old) + element (New)");
+                    // --- Model indirect update — New stage ---
+                    const modelNew = instances.find((i) => i.ECInstanceId === modelId && i.$meta.stage === "New");
+                    expect(modelNew).to.exist;
+                    assert.equal(modelNew.ECInstanceId, modelId);
+                    assert.equal(b1.getClassNameFromId(modelNew.ECClassId), "BisCore:DrawingModel");
+                    assert.isString(modelNew.LastMod);
+                    assert.isString(modelNew.GeometryGuid);
+                    assert.deepEqual(Object.keys(modelNew).sort(), ["ECInstanceId", "ECClassId", "LastMod", "GeometryGuid", "$meta"].sort());
+                    assert.deepEqual(Object.keys(modelNew.$meta).sort(), ["op", "tables", "changeIndexes", "stage", "instanceKey", "propFilter", "changeFetchedPropNames", "isIndirectChange"].sort());
+                    assert.equal(modelNew.$meta.op, "Updated");
+                    assert.equal(modelNew.$meta.stage, "New");
+                    assert.deepEqual(modelNew.$meta.tables, ["bis_Model"]);
+                    assert.deepEqual(modelNew.$meta.changeIndexes, [3]);
+                    assert.isString(modelNew.$meta.instanceKey);
+                    assert.equal(modelNew.$meta.instanceKey.split("-").length, 2);
+                    assert.equal(modelNew.$meta.propFilter, PropertyFilter.All);
+                    assert.deepEqual(modelNew.$meta.changeFetchedPropNames.sort(), ["ECInstanceId", "LastMod", "GeometryGuid"].sort());
+                    assert.equal(modelNew.$meta.isIndirectChange, true);
+                    // --- Model indirect update — Old stage (only key columns, no data properties) ---
+                    const modelOld = instances.find((i) => i.ECInstanceId === modelId && i.$meta.stage === "Old");
+                    expect(modelOld).to.exist;
+                    assert.equal(modelOld.ECInstanceId, modelId);
+                    assert.equal(b1.getClassNameFromId(modelOld.ECClassId), "BisCore:DrawingModel");
+                    assert.isUndefined(modelOld.LastMod, "Old stage carries only the key — no data properties");
+                    assert.isUndefined(modelOld.GeometryGuid, "Old stage carries only the key — no data properties");
+                    assert.deepEqual(Object.keys(modelOld).sort(), ["ECInstanceId", "ECClassId", "$meta"].sort());
+                    assert.deepEqual(Object.keys(modelOld.$meta).sort(), ["op", "tables", "changeIndexes", "stage", "instanceKey", "propFilter", "changeFetchedPropNames", "isIndirectChange"].sort());
+                    assert.equal(modelOld.$meta.op, "Updated");
+                    assert.equal(modelOld.$meta.stage, "Old");
+                    assert.deepEqual(modelOld.$meta.tables, ["bis_Model"]);
+                    assert.deepEqual(modelOld.$meta.changeIndexes, [3]);
+                    assert.isString(modelOld.$meta.instanceKey);
+                    assert.equal(modelOld.$meta.instanceKey.split("-").length, 2);
+                    assert.equal(modelOld.$meta.propFilter, PropertyFilter.All);
+                    assert.deepEqual(modelOld.$meta.changeFetchedPropNames.sort(), ["ECInstanceId", "LastMod", "GeometryGuid"].sort());
+                    assert.equal(modelOld.$meta.isIndirectChange, true);
+                    // --- Element insert — New stage ---
+                    const elemNew = instances.find((i) => i.ECInstanceId === elementId && i.$meta.stage === "New");
+                    expect(elemNew).to.exist;
+                    assert.equal(elemNew.ECInstanceId, elementId);
+                    assert.equal(b1.getClassNameFromId(elemNew.ECClassId), "TestDomain:SimpleElement");
+                    assert.equal(elemNew.Model.Id, modelId);
+                    assert.equal(b1.getClassNameFromId(elemNew.Model.RelECClassId), "BisCore:ModelContainsElements");
+                    assert.isString(elemNew.LastMod);
+                    assert.equal(elemNew.CodeSpec.Id, "0x1");
+                    assert.equal(b1.getClassNameFromId(elemNew.CodeSpec.RelECClassId), "BisCore:CodeSpecSpecifiesCode");
+                    assert.equal(elemNew.CodeScope.Id, "0x1");
+                    assert.equal(b1.getClassNameFromId(elemNew.CodeScope.RelECClassId), "BisCore:ElementScopesCode");
+                    assert.isString(elemNew.FederationGuid);
+                    assert.equal(elemNew.Category.Id, catId);
+                    assert.equal(b1.getClassNameFromId(elemNew.Category.RelECClassId), "BisCore:GeometricElement2dIsInCategory");
+                    assert.deepEqual(elemNew.Origin, { X: 0, Y: 0 });
+                    assert.equal(elemNew.Rotation, 0);
+                    assert.deepEqual(elemNew.BBoxLow, { X: -5, Y: -5 });
+                    assert.deepEqual(elemNew.BBoxHigh, { X: 5, Y: 5 });
+                    assert.include(String(elemNew.GeometryStream), "\"bytes\"");
+                    assert.equal(elemNew.p1, "hi", "p1 from the txn binary must be readable in lenient mode");
+                    assert.equal(elemNew.p2, "world", "p2 from the txn binary must be readable in lenient mode");
+                    // Object.keys — p3, p4 are absent because the binary txn has them but the live table does not
+                    assert.deepEqual(Object.keys(elemNew).sort(), [
+                        "ECInstanceId", "ECClassId", "Model", "LastMod", "CodeSpec", "CodeScope",
+                        "FederationGuid", "Category", "Origin", "Rotation", "BBoxLow", "BBoxHigh",
+                        "GeometryStream", "p1", "p2", "$meta",
+                    ].sort());
+                    // $meta keys
+                    assert.deepEqual(Object.keys(elemNew.$meta).sort(), ["op", "tables", "changeIndexes", "stage", "instanceKey", "propFilter", "changeFetchedPropNames", "isIndirectChange"].sort());
+                    assert.equal(elemNew.$meta.op, "Inserted");
+                    assert.equal(elemNew.$meta.stage, "New");
+                    assert.deepEqual(elemNew.$meta.tables.sort(), ["bis_Element", "bis_GeometricElement2d"].sort());
+                    assert.deepEqual(elemNew.$meta.changeIndexes.sort(), [1, 2].sort());
+                    assert.isString(elemNew.$meta.instanceKey);
+                    assert.equal(elemNew.$meta.instanceKey.split("-").length, 2);
+                    assert.equal(elemNew.$meta.propFilter, PropertyFilter.All);
+                    assert.deepEqual(elemNew.$meta.changeFetchedPropNames.sort(), [
+                        "ECInstanceId", "ECClassId", "Model.Id", "LastMod", "CodeSpec.Id", "CodeScope.Id",
+                        "CodeValue", "UserLabel", "Parent", "FederationGuid", "JsonProperties",
+                        "Category.Id", "Origin", "Rotation", "BBoxLow", "BBoxHigh", "GeometryStream",
+                        "TypeDefinition", "p1", "p2",
+                    ].sort());
+                    assert.equal(elemNew.$meta.isIndirectChange, false);
+                }
+                catch (e_34) {
+                    env_34.error = e_34;
+                    env_34.hasError = true;
+                }
+                finally {
+                    __disposeResources(env_34);
+                }
+            }
+        }
+        finally {
+            txn1.end();
+            b1.close();
+            HubMock.shutdown();
+        }
+    });
 });
 //# sourceMappingURL=ChangesetReader.test.js.map