@openui5/sap.ui.core 1.122.1 → 1.123.1

package/test/sap/ui/core/qunit/odata/v4/ODataModel.integration.qunit.js

@@ -49,7 +49,7 @@ sap.ui.define([
 	"use strict";
 
 		// system query options for collection responses, but not inside $expand
-	var rCollection = /[?&]\$(?:count|filter|orderby|search)/,
+	var rCollection = /[?&]\$(?:count|filter|orderby|search|skip|top)/,
 		sContext = "sap.ui.model.odata.v4.Context",
 		rCountTrue = /[?&]\$count=true/, // $count=true, but not inside $expand
 		rCountUrl = /\/\$count(?:\?|$)/, // URL for ".../$count?..."
@@ -266,6 +266,20 @@ sap.ui.define([
 		}
 	}
 
+	/**
+	 * Checks that the given context looks "persisted, not created".
+	 *
+	 * @param {object} assert - The QUnit assert object
+	 * @param {sap.ui.model.odata.v4.Context} oContext - A context
+	 */
+	function checkPersisted(assert, oContext) {
+		assert.strictEqual(oContext.created(), undefined, "persisted, not created");
+		assert.strictEqual(oContext.getProperty("@$ui5.context.isTransient"), undefined);
+		assert.strictEqual(oContext.isTransient(), undefined);
+		// Note: due to cloning, undefined values are dropped anyway
+		// assert.notOk("@$ui5.context.isTransient" in oContext.getObject());
+	}
+
 	/**
 	 * Checks the selection state of the given context.
 	 *
@@ -340,12 +354,8 @@ sap.ui.define([
 	 * @returns {Error}
 	 *   The error object for {@link #expectRequest}
 	 */
-	function createError(oErrorResponse, iHttpStatus, dRetryAfter) {
-		var oError;
-
-		iHttpStatus = iHttpStatus || 500;
-
-		oError = new Error("Communication error: " + iHttpStatus + " ");
+	function createError(oErrorResponse, iHttpStatus = 500, dRetryAfter = false) {
+		const oError = new Error("Communication error: " + iHttpStatus + " ");
 		if (oErrorResponse) {
 			oError.error = Object.assign({
 					code : "CODE",
@@ -490,7 +500,7 @@ sap.ui.define([
 	}
 
 	/**
-	 * Creates a test with the given title and executes viewStart with the given parameters.
+	 * Creates a test with the given title and invokes viewStart with the given parameters.
 	 *
 	 * @param {string} sTitle The title of the test case
 	 * @param {string} sView The XML snippet of the view
@@ -1159,7 +1169,7 @@ sap.ui.define([
 		 * @param {boolean} bDropFromCollection If <code>true</code> the context is no longer in
 		 *   the collection
 		 * @param {function} [fnOnBeforeDestroy]
-		 *  Call back function that is executed once the kept-alive context gets destroyed.
+		 *  Call back function that is invoked once the kept-alive context gets destroyed.
 		 * @returns {Promise} A promise that is resolved with the kept-alive context when the
 		 * view is created and ready
 		 */
@@ -1722,6 +1732,10 @@ sap.ui.define([
 				delete oActualRequest.headers["Accept-Language"];
 				delete oActualRequest.headers["Content-Type"];
 				if (oExpectedRequest) {
+					if (!oExpectedRequest.headers) {
+						oExpectedRequest.headers = {};
+						delete oActualRequest.headers["sap-cancel-on-close"];
+					}
 					oResponse = oExpectedRequest.response;
 					if (typeof oResponse === "function") { // invoke "just in time"
 						oResponse = oResponse();
@@ -1743,7 +1757,7 @@ sap.ui.define([
 						oActualRequest.$ContentID = sContentID;
 					}
 					assert.deepEqual(oActualRequest, oExpectedRequest,
-						sMethod + " " + readableUrl(sUrl));
+						sMethod + " " + readableUrl(sUrl) + " (batchNo: " + iBatchNo + ")");
 				} else {
 					assert.ok(false, sMethod + " " + readableUrl(sUrl) + " (unexpected)");
 					oResponse = {value : []}; // dummy response to avoid further errors
@@ -1989,7 +2003,7 @@ sap.ui.define([
 
 			// Ensures that oObject[vProperty] is an array and returns it
 			function array(oObject, vProperty) {
-				oObject[vProperty] = oObject[vProperty] || [];
+				oObject[vProperty] ??= [];
 
 				return oObject[vProperty];
 			}
@@ -2068,7 +2082,7 @@ sap.ui.define([
 			};
 
 			aExpectedEvents.forEach(function (aExpectedDetails) {
-				aExpectedDetails[0] = aExpectedDetails[0] || "";
+				aExpectedDetails[0] ??= "";
 				if (!aExpectedDetails[0].startsWith(sExpectedEventSourcePrefix)) {
 					aExpectedDetails[0] = sExpectedEventSourcePrefix + aExpectedDetails[0];
 				}
@@ -2083,8 +2097,11 @@ sap.ui.define([
 
 		/**
 		 * The following code (either {@link #createView} or anything before
-		 * {@link #waitForChanges}) is expected to report at least the given message. All expected
-		 * messages should have a different message text.
+		 * {@link #waitForChanges}) is expected to report the given message. It is added to the list
+		 * of messages that the MessageModel should contain in the end (see
+		 * {@link #expectMessages}).
+		 *
+		 * Note : All expected messages should have a different message text.
 		 *
 		 * @param {object} oExpectedMessage The expected message with properties corresponding
 		 *   to the getters of sap.ui.core.message.Message: message and type are required; code,
@@ -2092,8 +2109,6 @@ sap.ui.define([
 		 *   false) are optional; technicalDetails is only compared if given
 		 * @param {boolean} [bHasMatcher] Whether the expected message has a Sinon.JS matcher
 		 * @returns {object} The test instance for chaining
-		 *
-		 * @see #expectMessages
 		 */
 		expectMessage : function (oExpectedMessage, bHasMatcher) {
 			const aTargets = oExpectedMessage.targets || [oExpectedMessage.target || ""];
@@ -2117,9 +2132,12 @@ sap.ui.define([
 		},
 
 		/**
-		 * The following code (either {@link #createView} or anything before
-		 * {@link #waitForChanges}) is expected to report *exactly* the given messages. All expected
-		 * messages should have a different message text.
+		 * The MessageModel is expected to contain <b>exactly</b> the given messages when either
+		 * {@link #createView} or {@link #waitForChanges}) have finished. This expectation remains
+		 * valid for each subsequent {@link #waitForChanges}), until a new expectation is given.
+		 *
+		 * Note: The order does not matter, but all expected messages should have a different
+		 * message text.
 		 *
 		 * @param {object[]} aExpectedMessages The expected messages with properties corresponding
 		 *   to the getters of sap.ui.core.message.Message: message and type are required; code,
@@ -2204,9 +2222,8 @@ sap.ui.define([
 				}
 			}
 			// ensure that these properties are defined (required for deepEqual)
-			vRequest.headers = vRequest.headers || {};
-			vRequest.method = vRequest.method || "GET";
-			vRequest.payload = vRequest.payload || undefined;
+			vRequest.method ??= "GET";
+			vRequest.payload ??= undefined;
 			vRequest.responseHeaders = mResponseHeaders || {};
 			vRequest.response = vResponse
 					// With GET it must be visible that there is no content, with the other
@@ -2704,6 +2721,59 @@ sap.ui.define([
 		});
 	});
 
+	//*********************************************************************************************
+	// Scenario: PATCH an entity with a key predicate consisting of a single key property of type
+	// Edm.DateTimeOffset. The PATCH failed and a UI5 message is created.
+	// SNOW: CS20240007200281
+	QUnit.test("CS20240007200281: key property is Edm.DateTimeOffset", async function (assert) {
+		const oModel = this.createSpecialCasesModel({autoExpandSelect : true});
+		const sView = `
+<Table id="table" items="{/Artists(ArtistID='42',IsActiveEntity=true)/_Event}">
+	<Input id="name" value="{Name}"/>
+</Table>`;
+
+		this.expectRequest("Artists(ArtistID='42',IsActiveEntity=true)/_Event"
+				+ "?$select=Name,TimeStamp&$skip=0&$top=100", {
+				value : [
+					{Name : "Taubertal Festival", TimeStamp : "08-08-2024T01:02:03Z"}
+				]
+			})
+			.expectChange("name", ["Taubertal Festival"]);
+
+		await this.createView(assert, sView, oModel);
+		const aTableRows = this.oView.byId("table").getItems();
+
+		this.expectChange("name", ["Woodstock"])
+			.expectRequest({
+				method : "PATCH",
+				url : "Artists(ArtistID='42',IsActiveEntity=true)"
+					+ "/_Event(08-08-2024T01%3A02%3A03Z)",
+				payload : {Name : "Woodstock"}
+			}, createErrorInsideBatch({target : "Name"}))
+			.expectMessages([{
+				code : "CODE",
+				message : "Request intentionally failed",
+				persistent : true,
+				target : "/Artists(ArtistID='42',IsActiveEntity=true)"
+					+ "/_Event(08-08-2024T01%3A02%3A03Z)/Name",
+				technical : true,
+				type : "Error"
+			}]);
+
+		this.oLogMock.expects("error")
+			.withArgs("Failed to update path /Artists(ArtistID='42',IsActiveEntity=true)"
+				+ "/_Event(08-08-2024T01%3A02%3A03Z)/Name");
+
+		const oInput = aTableRows[0].getCells()[0];
+		// code under test
+		oInput.getBinding("value").setValue("Woodstock");
+
+		await this.waitForChanges(assert);
+
+		await this.checkValueState(assert, oInput, "Error",
+			"Request intentionally failed");
+	});
+
 	//*********************************************************************************************
 	// Scenario: Minimal test for an absolute ODataPropertyBinding. This scenario is comparable with
 	// "FavoriteProduct" in the SalesOrders application.
@@ -3129,7 +3199,7 @@ sap.ui.define([
 	// Scenario: Function import.
 	// This scenario is similar to the "Favorite product ID" in the SalesOrders application. In the
 	// SalesOrders application the binding context is set programmatically. This example directly
-	// triggers the function import.
+	// invokes the function import.
 	testViewStart("FunctionImport", '\
 <FlexBox binding="{/GetEmployeeByID(EmployeeID=\'2\')}">\
 	<Text id="text" text="{Name}"/>\
@@ -3686,7 +3756,7 @@ sap.ui.define([
 			});
 
 			return Promise.all([
-				that.oView.byId("action").getObjectBinding().execute(),
+				that.oView.byId("action").getObjectBinding().invoke(),
 				that.waitForChanges(assert)
 			]);
 		}).then(function (aResults) {
@@ -3715,7 +3785,7 @@ sap.ui.define([
 	});
 
 	//*********************************************************************************************
-	// Scenario: Immediately after execute the parameter is changed again. See that the request uses
+	// Scenario: Immediately after invoke the parameter is changed again. See that the request uses
 	// the old value. Even refresh must still use it.
 	// BCP: 2070180785
 	// TODO What about changing the context for the binding parameter?
@@ -3730,7 +3800,7 @@ sap.ui.define([
 
 			oBinding = that.oModel.bindContext("/GetEmployeeByID(...)");
 			oBinding.setParameter("EmployeeID", "1");
-			oPromise = oBinding.execute();
+			oPromise = oBinding.invoke();
 			oBinding.setParameter("EmployeeID", "2");
 
 			return Promise.all([oPromise, that.waitForChanges(assert)]);
@@ -3744,7 +3814,7 @@ sap.ui.define([
 			that.expectRequest("GetEmployeeByID(EmployeeID='2')", {ID : "2"});
 
 			return Promise.all([
-				oBinding.execute(),
+				oBinding.invoke(),
 				that.waitForChanges(assert)
 			]);
 		});
@@ -3921,7 +3991,7 @@ sap.ui.define([
 				});
 
 			return Promise.all([
-				that.oView.byId("action").getObjectBinding().execute(),
+				that.oView.byId("action").getObjectBinding().invoke(),
 				that.waitForChanges(assert)
 			]);
 		}).then(function (aResults) {
@@ -5152,6 +5222,7 @@ sap.ui.define([
 	//*********************************************************************************************
 	// Scenario: Failure to read from an ODataContextBinding returning a bound message
 	// BCP: 2070436327: the data state is updated if unbindProperty is called
+	// "sap-cancel-on-close" header for $direct GET request (JIRA: CPOUI5ODATAV4-2506)
 	QUnit.test("ODCB: read failure & message", function (assert) {
 		var oError = createError({
 				message : "Could not read",
@@ -5170,7 +5241,10 @@ sap.ui.define([
 		this.oLogMock.expects("error")
 			.withExactArgs("Failed to read path /EMPLOYEES('42')/Name", sinon.match(oError.message),
 				sODPrB);
-		this.expectRequest("EMPLOYEES('42')", oError)
+		this.expectRequest({
+				headers : {"sap-cancel-on-close" : "true"},
+				url : "EMPLOYEES('42')"
+			}, oError)
 			.expectMessages([{
 				code : "CODE",
 				message : "Could not read",
@@ -5701,7 +5775,7 @@ sap.ui.define([
 			});
 
 			return Promise.all([
-				that.oView.byId("action").getObjectBinding().execute(),
+				that.oView.byId("action").getObjectBinding().invoke(),
 				that.waitForChanges(assert)
 			]);
 		}).then(function (aResults) {
@@ -6310,7 +6384,7 @@ sap.ui.define([
 				that.oView.byId("form").getObjectBinding()
 					.setParameter("TeamID", "TEAM_01")
 					.setParameter("Budget", "1234.1234")
-					.execute(),
+					.invoke(),
 				that.waitForChanges(assert)
 			]);
 		}).then(function () {
@@ -6426,7 +6500,7 @@ sap.ui.define([
 					}
 				}); // response does not matter here
 
-			oOperationBinding.execute();
+			oOperationBinding.invoke();
 
 			return that.waitForChanges(assert);
 		}).then(function () {
@@ -6532,7 +6606,7 @@ sap.ui.define([
 			}, {/* response does not matter here */});
 
 			// code under test
-			oOperation.execute();
+			oOperation.invoke();
 
 			return that.waitForChanges(assert);
 		}).then(function () {
@@ -6544,7 +6618,7 @@ sap.ui.define([
 				});
 
 			that.oLogMock.expects("error")
-				.withExactArgs("Failed to execute /ChangeTeamBudgetByID(...)",
+				.withExactArgs("Failed to invoke /ChangeTeamBudgetByID(...)",
 					sinon.match(oError.message), sODCB);
 			that.expectRequest({
 					method : "POST",
@@ -6568,7 +6642,7 @@ sap.ui.define([
 				.expectChange("budget", "-42");
 
 			return Promise.all([
-				oOperation.setParameter("Budget", "-42").execute()
+				oOperation.setParameter("Budget", "-42").invoke()
 					.then(mustFail(assert), function (oError0) {
 						assert.strictEqual(oError0, oError);
 					}),
@@ -6786,7 +6860,7 @@ sap.ui.define([
 			}, {/* response does not matter here */});
 
 			// code under test
-			return Promise.all([oOperation.execute(), that.waitForChanges(assert)]);
+			return Promise.all([oOperation.invoke(), that.waitForChanges(assert)]);
 		});
 	});
 
@@ -6830,7 +6904,7 @@ sap.ui.define([
 
 			return Promise.all([
 				// code under test
-				oOperation.execute(),
+				oOperation.invoke(),
 				that.waitForChanges(assert)
 			]);
 		}).then(function () {
@@ -7100,7 +7174,7 @@ sap.ui.define([
 	// * See that the count decreases
 	// The delete is used to change the count (to see that it is still updated)
 	//
-	// Call ODLB#sort with the same Sorter as before. This should not trigger a request.
+	// Call ODLB#sort with the same Sorter as before. This should not invoke a request.
 	// JIRA: CPOUI5ODATAV4-942
 	QUnit.test("ODLB: $count and sort()", function (assert) {
 		var oTable,
@@ -7383,7 +7457,7 @@ sap.ui.define([
 
 	//*********************************************************************************************
 	// Scenario: A relative list binding's context is changed. Additionally a refresh (via
-	// requestSideEffects) is triggered after the binding has recreated its cache, but before the
+	// requestSideEffects) is invoked after the binding has recreated its cache, but before the
 	// dependent property bindings have been destroyed. In the incident, the list table contains
 	// the items and the detail table the schedules (with 1:n, which we don't have here).
 	// BCP: 2080123400
@@ -7723,7 +7797,7 @@ sap.ui.define([
 			oBinding.suspend();
 			oBinding.refresh();
 
-			// Do not immediately resume to see that no requests are triggered by refresh
+			// Do not immediately resume to see that no requests are invoked by refresh
 			return resolveLater();
 		}).then(function () {
 			that.expectEvents(assert, "sap.ui.model.odata.v4.OData", [
@@ -8111,6 +8185,8 @@ sap.ui.define([
 	//
 	// Tell the model to ignore the ETag, but no If-Match:* must be sent unless an ETag was present
 	// JIRA: CPOUI5ODATAV4-1894
+	//
+	// No "sap-cancel-on-close" header in PATCH request (JIRA: CPOUI5ODATAV4-2506)
 ["$auto", "$direct"].forEach(function (sGroupId) {
 	[false, true].forEach(function (bETag) {
 	var sTitle = "Modify a property, server responds with 204 (No Content), group = " + sGroupId
@@ -11734,6 +11810,8 @@ sap.ui.define([
 
 	//*********************************************************************************************
 	// Scenario: Failure when creating a sales order line item. Observe the message.
+	//
+	// No "sap-cancel-on-close" header in POST request (JIRA: CPOUI5ODATAV4-2506)
 	QUnit.test("Create error", function (assert) {
 		var oModel = this.createSalesOrdersModel({autoExpandSelect : true, groupId : "$direct"}),
 			oTable,
@@ -11764,6 +11842,7 @@ sap.ui.define([
 					+ "will be repeated automatically", sinon.match(oError.message), sODLB);
 			that.expectRequest({
 					method : "POST",
+					headers : {/*NO "sap-cancel-on-close"*/},
 					url : "SalesOrderList('42')/SO_2_SOITEM",
 					payload : {}
 				}, oError)
@@ -12340,16 +12419,16 @@ sap.ui.define([
 	});
 
 	//*********************************************************************************************
-	// Scenario: Execute a bound action while an update request for the entity is not yet
+	// Scenario: Invoke a bound action while an update request for the entity is not yet
 	// resolved. Determine the ETag as late as possible.
 	// JIRA: CPOUI5UISERVICESV3-1450
 	//
 	// Do not update binding parameter when both key predicates are missing.
 	// JIRA: CPOUI5ODATAV4-1683
-	QUnit.test("Lazy determination of ETag while ODataContextBinding#execute", function (assert) {
+	QUnit.test("Lazy determination of ETag while ODataContextBinding#invoke", function (assert) {
 		var sAction = "com.sap.gateway.default.iwbep.tea_busi.v0001.AcChangeTeamOfEmployee",
 			oBinding,
-			oExecutePromise,
+			oInvokePromise,
 			oModel = this.createTeaBusiModel({updateGroupId : "update"}),
 			fnRespond,
 			oSubmitBatchPromise,
@@ -12386,7 +12465,7 @@ sap.ui.define([
 						Name : "Jonathan Müller"
 					});
 				}))
-				.expectChange("name", "Jonathan Mueller"); // triggered by setValue
+				.expectChange("name", "Jonathan Mueller"); // invoked by setValue
 
 			oBinding.setValue("Jonathan Mueller");
 
@@ -12394,10 +12473,10 @@ sap.ui.define([
 
 			return that.waitForChanges(assert);
 		}).then(function () {
-			oExecutePromise = that.oView.byId("action").getObjectBinding()
-				.setParameter("TeamID", "42").execute("update");
+			oInvokePromise = that.oView.byId("action").getObjectBinding()
+				.setParameter("TeamID", "42").invoke("update");
 
-			that.expectChange("name", "Jonathan Müller"); // triggered by PATCH response
+			that.expectChange("name", "Jonathan Müller"); // invoked by PATCH response
 			fnRespond();
 
 			return Promise.all([
@@ -12419,7 +12498,7 @@ sap.ui.define([
 
 			return Promise.all([
 				that.oModel.submitBatch("update"),
-				oExecutePromise.then(function (oReturnValueContext) {
+				oInvokePromise.then(function (oReturnValueContext) {
 					assert.strictEqual(oReturnValueContext, undefined,
 						"no R.V.C. w/o key predicate");
 				}),
@@ -12429,13 +12508,13 @@ sap.ui.define([
 	});
 
 	//*********************************************************************************************
-	// Scenario: Execute a bound action a 2nd time while the 1st POST is still "in flight"
+	// Scenario: Invoke a bound action a 2nd time while the 1st POST is still "in flight"
 	// BCP: 2380023421
-	QUnit.test("Lazy determination of ETag by ODataContextBinding#execute", function (assert) {
+	QUnit.test("Lazy determination of ETag by ODataContextBinding#invoke", function (assert) {
 		var sAction = "com.sap.gateway.default.iwbep.tea_busi.v0001.AcChangeTeamOfEmployee",
 			oContext,
-			oExecutePromise1,
-			oExecutePromise2,
+			oInvokePromise1,
+			oInvokePromise2,
 			oModel = this.createTeaBusiModel({autoExpandSelect : true}),
 			fnRespond,
 			sView = '\
@@ -12471,19 +12550,19 @@ sap.ui.define([
 					});
 				}));
 
-			oExecutePromise1 = oModel.bindContext(sAction + "(...)", oContext)
+			oInvokePromise1 = oModel.bindContext(sAction + "(...)", oContext)
 				.setParameter("TeamID", "42")
-				.execute();
+				.invoke();
 
-			return that.waitForChanges(assert, "1st #execute");
+			return that.waitForChanges(assert, "1st #invoke");
 		}).then(function () {
 			// expect no 2nd POST yet!
 
-			oExecutePromise2 = oModel.bindContext(sAction + "(...)", oContext)
+			oInvokePromise2 = oModel.bindContext(sAction + "(...)", oContext)
 				.setParameter("TeamID", "23")
-				.execute();
+				.invoke();
 
-			return that.waitForChanges(assert, "2nd #execute");
+			return that.waitForChanges(assert, "2nd #invoke");
 		}).then(function () {
 			that.expectChange("name", "Jonathan Smith junior")
 				.expectChange("teamId", "42")
@@ -12504,11 +12583,11 @@ sap.ui.define([
 			fnRespond();
 
 			return Promise.all([
-				oExecutePromise1,
-				oExecutePromise2.then(function () {
+				oInvokePromise1,
+				oInvokePromise2.then(function () {
 					assert.strictEqual(oContext.getProperty("@odata.etag"), "ETag2");
 				}),
-				that.waitForChanges(assert, "1st response triggers 2nd request")
+				that.waitForChanges(assert, "1st response invokes 2nd request")
 			]);
 		});
 	});
@@ -13462,6 +13541,7 @@ sap.ui.define([
 	// Scenario: bound action (success and failure)
 	// JIRA: CPOUI5ODATAV4-29 (bound action parameter and error with message target)
 	// JIRA: CPOUI5ODATAV4-132 (bind property of binding parameter relative to $Parameter)
+	// No "sap-cancel-on-close" header in POST request (JIRA: CPOUI5ODATAV4-2506)
 	QUnit.test("Bound action", function (assert) {
 		var oModel = this.createTeaBusiModel({autoExpandSelect : true, groupId : "$direct"}),
 			sView = '\
@@ -13516,14 +13596,14 @@ sap.ui.define([
 		}).then(function () {
 			that.expectRequest({
 					method : "POST",
-					headers : {"If-Match" : "ETag"},
+					headers : {"If-Match" : "ETag"/*, NO "sap-cancel-on-close"*/},
 					url : sUrl,
 					payload : {TeamID : "42"}
 				}, {TEAM_ID : "42"})
 				.expectChange("teamId", "42");
 
 			return Promise.all([
-				that.oView.byId("action").getObjectBinding().execute()
+				that.oView.byId("action").getObjectBinding().invoke()
 					.then(function (oReturnValueContext) {
 						assert.strictEqual(oReturnValueContext, undefined,
 							"no R.V.C. w/o key predicate");
@@ -13548,14 +13628,14 @@ sap.ui.define([
 					}]
 				});
 
-			that.oLogMock.expects("error").withExactArgs("Failed to execute /" + sUrl + "(...)",
+			that.oLogMock.expects("error").withExactArgs("Failed to invoke /" + sUrl + "(...)",
 				sinon.match(oError.message), sODCB);
 			that.oLogMock.expects("error").withExactArgs(//TODO: prevent log -> CPOUI5ODATAV4-127
 				"Failed to read path /" + sUrl + "(...)/TEAM_ID", sinon.match(oError.message),
 				sODPrB);
 			that.expectRequest({
 					method : "POST",
-					headers : {"If-Match" : "ETag"},
+					headers : {"If-Match" : "ETag"/*, NO "sap-cancel-on-close"*/},
 					url : sUrl,
 					payload : {TeamID : ""}
 				}, oError) // simulates failure
@@ -13588,7 +13668,7 @@ sap.ui.define([
 				.expectChange("teamId", null); // reset to initial state
 
 			return Promise.all([
-				that.oView.byId("action").getObjectBinding().setParameter("TeamID", "").execute()
+				that.oView.byId("action").getObjectBinding().setParameter("TeamID", "").invoke()
 					.then(mustFail(assert), function (oError0) {
 						assert.strictEqual(oError0, oError);
 					}),
@@ -13642,7 +13722,7 @@ sap.ui.define([
 
 			return Promise.all([
 				// code under test
-				that.oModel.bindContext("special.cases.GetDefaults(...)", oHeaderContext).execute(),
+				that.oModel.bindContext("special.cases.GetDefaults(...)", oHeaderContext).invoke(),
 				that.waitForChanges(assert)
 			]);
 		}).then(function (aResults) {
@@ -13685,7 +13765,7 @@ sap.ui.define([
 				.setParameter("Name", oDefaults.getObject("Name"));
 
 			return Promise.all([
-				oAction.execute(),
+				oAction.invoke(),
 				that.waitForChanges(assert)
 			]);
 		}).then(function (aPromiseResults) {
@@ -13846,7 +13926,7 @@ sap.ui.define([
 
 			return Promise.all([
 				// code under test
-				oAction.execute().then(function (oResult) {
+				oAction.invoke().then(function (oResult) {
 					assert.strictEqual(oResult, undefined,
 						"no R.V.C. because EMPLOYEE_2_TEAM is missing");
 				}),
@@ -13857,14 +13937,14 @@ sap.ui.define([
 });
 
 	//*********************************************************************************************
-	// Scenario: Execute a bound action for an entity in a list binding and afterwards call refresh
+	// Scenario: Invoke a bound action for an entity in a list binding and afterwards call refresh
 	// with bAllowRemoval=true for the context the entity is pointing to. If the entity is gone from
 	// the list binding no error should happen because of the just deleted context.
 	// TODO Test with a created binding parameter, too. This failed in an OPA test previously.
 	QUnit.test("Bound action with context refresh which removes the context", function (assert) {
 		var oAction,
 			oContext,
-			oExecutionPromise,
+			oInvocationPromise,
 			oModel = this.createTeaBusiModel({autoExpandSelect : true}),
 			sView = '\
 <Table id="table"\
@@ -13906,11 +13986,11 @@ sap.ui.define([
 				+ ".AcChangeTeamOfEmployee(...)", oContext);
 
 			// code under test
-			oExecutionPromise = oAction.setParameter("TeamID", "42").execute();
+			oInvocationPromise = oAction.setParameter("TeamID", "42").invoke();
 
 			return Promise.all([
 				oContext.requestRefresh(undefined, true),
-				oExecutionPromise.then(function (oReturnValueContext) {
+				oInvocationPromise.then(function (oReturnValueContext) {
 					assert.strictEqual(oReturnValueContext, undefined,
 						"no R.V.C. w/o key predicate");
 				}),
@@ -13962,7 +14042,7 @@ sap.ui.define([
 				// code under test
 				that.oView.byId("action").getObjectBinding()
 					.setParameter("Message", "The quick brown fox jumps over the lazy dog")
-					.execute(undefined, true), // CPOUI5ODATAV4-869
+					.invoke(undefined, true), // CPOUI5ODATAV4-869
 				that.waitForChanges(assert)
 			]);
 		});
@@ -13993,7 +14073,7 @@ sap.ui.define([
 				// code under test
 				that.oView.byId("function").getObjectBinding()
 					.setParameter("EmployeeID", "1")
-					.execute(),
+					.invoke(),
 				that.waitForChanges(assert)
 			]);
 		});
@@ -14084,7 +14164,7 @@ sap.ui.define([
 	// i.e. it changes the initially aggregated query options. Note: It is also possible to remove
 	// a filter which must lead to removal of the $filter option.
 	//
-	// Call ODLB#filter with the same Filter as before. this should not trigger a request.
+	// Call ODLB#filter with the same Filter as before. this should not invoke a request.
 	// CPOUI5ODATAV4-942
 	QUnit.test("Absolute ODLB with auto-$expand/$select: filter via API", function (assert) {
 		var oModel = this.createTeaBusiModel({autoExpandSelect : true}),
@@ -15132,46 +15212,47 @@ sap.ui.define([
 	//
 	// JIRA: CPOUI5ODATAV4-1628
 	QUnit.test("CPOUI5ODATAV4-1628: re-read Edm.Stream URL & readLink", function (assert) {
-		var oContext,
+		var sArtist = "Artists(ArtistID='42',IsActiveEntity=true)",
+			oContext,
 			oModel = this.createSpecialCasesModel({autoExpandSelect : true}),
-			sView = '\
-<FlexBox id="form" binding="{/Artists(ArtistID=\'42\')}">\
-	<Text id="picture" text="{Picture}"/>\
-	<Text id="link" text="{= %{Picture@odata.mediaReadLink} }"/>\
-</FlexBox>',
+			sView = `
+<FlexBox id="form" binding="{/${sArtist}}">
+	<Text id="picture" text="{Picture}"/>
+	<Text id="link" text="{= %{Picture@odata.mediaReadLink} }"/>
+</FlexBox>`,
 			sPrefix = "/special/cases/",
 			that = this;
 
-		this.expectRequest("Artists(ArtistID='42')"
-				+ "?$select=ArtistID,IsActiveEntity,Picture", {
-				ID : "42",
+		this.expectRequest(sArtist + "?$select=ArtistID,IsActiveEntity,Picture", {
+				ArtistID : "42",
+				IsActiveEntity : true,
 				// Picture (Edm.Stream) missing here
-				"Picture@odata.mediaReadLink" : "Artists(ArtistID='42')/Picture"
+				"Picture@odata.mediaReadLink" : sArtist + "/Picture"
 			})
-			.expectChange("picture", sPrefix + "Artists(ArtistID='42')/Picture")
-			.expectChange("link", sPrefix + "Artists(ArtistID='42')/Picture")
+			.expectChange("picture", sPrefix + sArtist + "/Picture")
+			.expectChange("link", sPrefix + sArtist + "/Picture")
 			.expectEvents(assert, "sap.ui.model.odata.v4.OData", [
-				["ContextBinding: /Artists(ArtistID='42')", "change", {reason : "change"}],
-				["ContextBinding: /Artists(ArtistID='42')", "dataRequested", undefined],
-				["ContextBinding: /Artists(ArtistID='42')", "dataReceived", {data : {}}],
-				["PropertyBinding: /Artists(ArtistID='42')|Picture", "change", {reason : "change"}],
-				["PropertyBinding: /Artists(ArtistID='42')"
-					+ "|Picture@odata.mediaReadLink", "change", {reason : "change"}]
+				["ContextBinding: /" + sArtist, "change", {reason : "change"}],
+				["ContextBinding: /" + sArtist, "dataRequested", undefined],
+				["ContextBinding: /" + sArtist, "dataReceived", {data : {}}],
+				["PropertyBinding: /" + sArtist + "|Picture", "change", {reason : "change"}],
+				["PropertyBinding: /" + sArtist + "|Picture@odata.mediaReadLink", "change",
+					{reason : "change"}]
 			]);
 
 		return this.createView(assert, sView, oModel).then(function () {
 			oContext = that.oView.byId("form").getBindingContext();
 
-			that.expectRequest("Artists(ArtistID='42')?$select=Picture", {
-					ID : "42",
+			that.expectRequest(sArtist + "?$select=Picture", {
+					ArtistID : "42",
+					IsActiveEntity : true,
 					// Picture (Edm.Stream) missing here
-					"Picture@odata.mediaReadLink" : "Artists(ArtistID='42')/Picture"
+					"Picture@odata.mediaReadLink" : sArtist + "/Picture"
 				})
-				.expectChange("picture", sPrefix + "Artists(ArtistID='42')/Picture")
+				.expectChange("picture", sPrefix + sArtist + "/Picture")
 				.expectEvents(assert, "sap.ui.model.odata.v4.OData", [
-				["PropertyBinding: /Artists(ArtistID='42')|Picture",
-					"change", {reason : "change"}]
-			]);
+					["PropertyBinding: /" + sArtist + "|Picture", "change", {reason : "change"}]
+				]);
 
 			return Promise.all([
 				// code under test
@@ -15179,17 +15260,17 @@ sap.ui.define([
 				that.waitForChanges(assert, "(1) unchanged URL via @odata.mediaReadLink annotation")
 			]);
 		}).then(function () {
-			that.expectRequest("Artists(ArtistID='42')?$select=Picture", {
-					ID : "42"
+			that.expectRequest(sArtist + "?$select=Picture", {
+					ArtistID : "42",
+					IsActiveEntity : true
 					// Picture (Edm.Stream) missing here
 				})
-				.expectChange("picture", sPrefix + "Artists(ArtistID='42')/Picture")
+				.expectChange("picture", sPrefix + sArtist + "/Picture")
 				.expectChange("link", undefined) // no more Picture@odata.mediaReadlink
 				.expectEvents(assert, "sap.ui.model.odata.v4.OData", [
-					["PropertyBinding: /Artists(ArtistID='42')|Picture@odata.mediaReadLink",
-						"change", {reason : "change"}],
-					["PropertyBinding: /Artists(ArtistID='42')|Picture",
-						"change", {reason : "change"}]
+					["PropertyBinding: /" + sArtist + "|Picture@odata.mediaReadLink", "change",
+						{reason : "change"}],
+					["PropertyBinding: /" + sArtist + "|Picture", "change", {reason : "change"}]
 				]);
 
 			return Promise.all([
@@ -15198,14 +15279,14 @@ sap.ui.define([
 				that.waitForChanges(assert, "(2) no URL in response (calculated by model)")
 			]);
 		}).then(function () {
-			that.expectRequest("Artists(ArtistID='42')?$select=Picture", {
-					ID : "42"
+			that.expectRequest(sArtist + "?$select=Picture", {
+					ArtistID : "42",
+					IsActiveEntity : true
 					// Picture (Edm.Stream) missing here
 				})
-				.expectChange("picture", sPrefix + "Artists(ArtistID='42')/Picture")
+				.expectChange("picture", sPrefix + sArtist + "/Picture")
 				.expectEvents(assert, "sap.ui.model.odata.v4.OData", [
-					["PropertyBinding: /Artists(ArtistID='42')|Picture",
-						"change", {reason : "change"}]
+					["PropertyBinding: /" + sArtist + "|Picture", "change", {reason : "change"}]
 				]);
 
 			return Promise.all([
@@ -15214,18 +15295,18 @@ sap.ui.define([
 				that.waitForChanges(assert, "(3) again, no URL in response (calculated by model)")
 			]);
 		}).then(function () {
-			that.expectRequest("Artists(ArtistID='42')?$select=Picture", {
-					ID : "42",
+			that.expectRequest(sArtist + "?$select=Picture", {
+					ArtistID : "42",
+					IsActiveEntity : true,
 					// Picture (Edm.Stream) missing here
-					"Picture@odata.mediaReadLink" : "Artists(ArtistID='42')/Picture"
+					"Picture@odata.mediaReadLink" : sArtist + "/Picture"
 				})
-				.expectChange("picture", sPrefix + "Artists(ArtistID='42')/Picture")
-				.expectChange("link", sPrefix + "Artists(ArtistID='42')/Picture")
+				.expectChange("picture", sPrefix + sArtist + "/Picture")
+				.expectChange("link", sPrefix + sArtist + "/Picture")
 				.expectEvents(assert, "sap.ui.model.odata.v4.OData", [
-					["PropertyBinding: /Artists(ArtistID='42')|Picture@odata.mediaReadLink",
-						"change", {reason : "change"}],
-					["PropertyBinding: /Artists(ArtistID='42')|Picture",
-						"change", {reason : "change"}]
+					["PropertyBinding: /" + sArtist + "|Picture@odata.mediaReadLink", "change",
+						{reason : "change"}],
+					["PropertyBinding: /" + sArtist + "|Picture", "change", {reason : "change"}]
 				]);
 
 			return Promise.all([
@@ -15234,18 +15315,17 @@ sap.ui.define([
 				that.waitForChanges(assert, "(4) back to URL via @odata.mediaReadLink")
 			]);
 		}).then(function () {
-			that.expectRequest("Artists(ArtistID='42')?$select=Picture", {
+			that.expectRequest(sArtist + "?$select=Picture", {
 					ID : "42",
 					// Picture (Edm.Stream) missing here
-					"Picture@odata.mediaReadLink" : "Artists(ArtistID='42')/PictureHighRes"
+					"Picture@odata.mediaReadLink" : sArtist + "/PictureHighRes"
 				})
-				.expectChange("picture", sPrefix + "Artists(ArtistID='42')/PictureHighRes")
-				.expectChange("link", sPrefix + "Artists(ArtistID='42')/PictureHighRes")
+				.expectChange("picture", sPrefix + sArtist + "/PictureHighRes")
+				.expectChange("link", sPrefix + sArtist + "/PictureHighRes")
 				.expectEvents(assert, "sap.ui.model.odata.v4.OData", [
-					["PropertyBinding: /Artists(ArtistID='42')|Picture@odata.mediaReadLink",
-						"change", {reason : "change"}],
-					["PropertyBinding: /Artists(ArtistID='42')|Picture",
-						"change", {reason : "change"}]
+					["PropertyBinding: /" + sArtist + "|Picture@odata.mediaReadLink", "change",
+						{reason : "change"}],
+					["PropertyBinding: /" + sArtist + "|Picture", "change", {reason : "change"}]
 				]);
 
 			return Promise.all([
@@ -15255,6 +15335,79 @@ sap.ui.define([
 			]);
 		});
 	});
+
+	//*********************************************************************************************
+	// Scenario: We simulate parts of a file upload here. Initially, the Edm.Stream property is
+	// missing from the response (of course) and a late property request is sent leading to
+	// "Picture@$ui5.noData : true" being set. File upload happens outside the model and only a file
+	// name would be PATCHed, this is omitted here. Removal of the file requires the model to PATCH
+	// a null value, which ruins the URL. Thus the property is reset to undefined on the client side
+	// only. This must not prevent a side effect from setting "Picture@$ui5.noData : true" again!
+	// Thus upload and removal can be repeated (endlessly) while a URL is implicitly available for
+	// up- and download at all times.
+	// SNOW: DINC0088146
+	QUnit.test("DINC0088146", async function (assert) {
+		const oModel = this.createSpecialCasesModel({autoExpandSelect : true});
+		const sView = `
+<Table id="list" items="{/Artists}">
+	<Text id="id" text="{ArtistID}"/>
+</Table>
+<FlexBox id="detail">
+	<Text id="link" text="{Picture}"/>
+</FlexBox>`;
+		const sLink = "/special/cases/Artists(ArtistID='42',IsActiveEntity=true)/Picture";
+
+		this.expectRequest("Artists?$select=ArtistID,IsActiveEntity&$skip=0&$top=100", {
+				value : [{
+					ArtistID : "42",
+					IsActiveEntity : true
+				}]
+			})
+			.expectChange("link");
+
+		await this.createView(assert, sView, oModel);
+
+		this.expectRequest("Artists(ArtistID='42',IsActiveEntity=true)?$select=Picture", {
+				ArtistID : "42",
+				// Picture (Edm.Stream) missing here
+				"Picture@odata.mediaContentType" : null
+			})
+			.expectChange("link", sLink);
+
+		const oContext = this.oView.byId("list").getItems()[0].getBindingContext();
+		this.oView.byId("detail").setBindingContext(oContext);
+
+		await this.waitForChanges(assert, "detail");
+
+		for (let i = 0; i < 3; i += 1) {
+			this.expectChange("link", null)
+				.expectChange("link", sLink)
+				.expectRequest({
+					method : "PATCH",
+					url : "Artists(ArtistID='42',IsActiveEntity=true)",
+					payload : {Picture : null}
+				})
+				.expectRequest("Artists?$select=ArtistID,IsActiveEntity,Picture"
+					+ "&$filter=ArtistID eq '42' and IsActiveEntity eq true", {
+					value : [{
+						ArtistID : "42",
+						IsActiveEntity : true,
+						// Picture (Edm.Stream) missing here
+						"Picture@odata.mediaContentType" : null
+					}]
+				})
+				.expectChange("link", sLink); // due to "Picture@$ui5.noData : true" being set
+
+			// eslint-disable-next-line no-await-in-loop
+			await Promise.all([
+				oContext.setProperty("Picture", null),
+				oContext.requestSideEffects(["Picture"]),
+				oContext.setProperty("Picture", undefined, /*sGroupId*/null),
+				this.waitForChanges(assert, "remove #" + i)
+			]);
+		}
+	});
+
 	//*********************************************************************************************
 	// Scenario: Writing instance annotations via create and update.
 	// 1. POST: Initial payload containing instance annotations
@@ -15676,7 +15829,9 @@ sap.ui.define([
 
 	//*********************************************************************************************
 	// Scenario: Minimal test for two absolute ODataPropertyBindings using different direct groups.
-	QUnit.test("Absolute ODPBs using different $direct groups", function (assert) {
+	//
+	// "sap-cancel-on-close" header for SubmitMode.Direct GET request (JIRA: CPOUI5ODATAV4-2506)
+	QUnit.test("Absolute ODPBs using different direct groups", function (assert) {
 		var sView = '\
 <Text id="text1" text="{\
 	path : \'/EMPLOYEES(\\\'2\\\')/Name\',\
@@ -15686,8 +15841,14 @@ sap.ui.define([
 	parameters : {$$groupId : \'group2\'}}"\
 />';
 
-		this.expectRequest("EMPLOYEES('2')/Name", {value : "Frederic Fall"})
-			.expectRequest("EMPLOYEES('3')/Name", {value : "Jonathan Smith"})
+		this.expectRequest({
+				headers : {"sap-cancel-on-close" : "true"},
+				url : "EMPLOYEES('2')/Name"
+			}, {value : "Frederic Fall"})
+			.expectRequest({
+				headers : {"sap-cancel-on-close" : "true"},
+				url : "EMPLOYEES('3')/Name"
+			}, {value : "Jonathan Smith"})
 			.expectChange("text1", "Frederic Fall")
 			.expectChange("text2", "Jonathan Smith");
 
@@ -15961,16 +16122,16 @@ sap.ui.define([
 
 			return Promise.all([
 				// code under test
-				that.oView.byId("function").getObjectBinding().execute(),
+				that.oView.byId("function").getObjectBinding().invoke(),
 				that.waitForChanges(assert)
 			]);
 		});
 	});
 
 	//*********************************************************************************************
-	// Scenario: Operation binding for a function, first it is deferred, later is has been executed.
-	//   Show interaction of setParameter(), execute() and refresh().
-	QUnit.test("Function binding: setParameter, execute and refresh", function (assert) {
+	// Scenario: Operation binding for a function, first it is deferred, later is has been invoked.
+	//   Show interaction of setParameter(), invoke() and refresh().
+	QUnit.test("Function binding: setParameter, invoke and refresh", function (assert) {
 		var oFunctionBinding,
 			sView = '\
 <FlexBox id="function" binding="{/GetEmployeeByID(...)}">\
@@ -15983,7 +16144,7 @@ sap.ui.define([
 		return this.createView(assert, sView).then(function () {
 			oFunctionBinding = that.oView.byId("function").getObjectBinding();
 
-			oFunctionBinding.refresh(); // MUST NOT trigger a request!
+			oFunctionBinding.refresh(); // MUST NOT invoke a request!
 
 			that.expectRequest("GetEmployeeByID(EmployeeID='1')", {
 					ID : "1",
@@ -15992,7 +16153,7 @@ sap.ui.define([
 				.expectChange("name", "Jonathan Smith");
 
 			return Promise.all([
-				oFunctionBinding.setParameter("EmployeeID", "1").execute(),
+				oFunctionBinding.setParameter("EmployeeID", "1").invoke(),
 				that.waitForChanges(assert)
 			]);
 		}).then(function () {
@@ -16007,7 +16168,7 @@ sap.ui.define([
 		}).then(function () {
 			oFunctionBinding.setParameter("EmployeeID", "2");
 
-			oFunctionBinding.refresh(); // MUST NOT trigger a request!
+			oFunctionBinding.refresh(); // MUST NOT invoke a request!
 
 			that.expectRequest("GetEmployeeByID(EmployeeID='2')", {
 					ID : "2",
@@ -16016,7 +16177,7 @@ sap.ui.define([
 				.expectChange("name", "Peter Burke");
 
 			return Promise.all([
-				oFunctionBinding.execute(),
+				oFunctionBinding.invoke(),
 				that.waitForChanges(assert)
 			]);
 		}).then(function () {
@@ -16032,9 +16193,9 @@ sap.ui.define([
 	});
 
 	//*********************************************************************************************
-	// Scenario: Operation binding for a function, first it is deferred, later is has been executed.
-	//   Show interaction of setParameter(), execute() and changeParameters().
-	QUnit.test("Function binding: setParameter, execute and changeParameters", function (assert) {
+	// Scenario: Operation binding for a function, first it is deferred, later is has been invoked.
+	//   Show interaction of setParameter(), invoke() and changeParameters().
+	QUnit.test("Function binding: setParameter, invoke and changeParameters", function (assert) {
 		var oFunctionBinding,
 			sView = '\
 <FlexBox id="function" binding="{/GetEmployeeByID(...)}">\
@@ -16047,7 +16208,7 @@ sap.ui.define([
 		return this.createView(assert, sView).then(function () {
 			oFunctionBinding = that.oView.byId("function").getObjectBinding();
 
-			oFunctionBinding.changeParameters({$select : "Name"}); // MUST NOT trigger a request!
+			oFunctionBinding.changeParameters({$select : "Name"}); // MUST NOT invoke a request!
 
 			that.expectRequest("GetEmployeeByID(EmployeeID='1')?$select=Name", {
 					Name : "Jonathan Smith"
@@ -16055,7 +16216,7 @@ sap.ui.define([
 				.expectChange("name", "Jonathan Smith");
 
 			return Promise.all([
-				oFunctionBinding.setParameter("EmployeeID", "1").execute(),
+				oFunctionBinding.setParameter("EmployeeID", "1").invoke(),
 				that.waitForChanges(assert)
 			]);
 		}).then(function () {
@@ -16070,7 +16231,7 @@ sap.ui.define([
 		}).then(function () {
 			oFunctionBinding.setParameter("EmployeeID", "2");
 
-			// MUST NOT trigger a request!
+			// MUST NOT invoke a request!
 			oFunctionBinding.changeParameters({$select : "Name"});
 
 			that.expectRequest("GetEmployeeByID(EmployeeID='2')?$select=Name", {
@@ -16079,7 +16240,7 @@ sap.ui.define([
 				.expectChange("name", "Peter Burke");
 
 			return Promise.all([
-				oFunctionBinding.execute(),
+				oFunctionBinding.invoke(),
 				that.waitForChanges(assert)
 			]);
 		}).then(function () {
@@ -16636,7 +16797,7 @@ sap.ui.define([
 
 			return Promise.all([
 				// code under test
-				oActionBinding.setParameter("TeamID", "TEAM_02").execute()
+				oActionBinding.setParameter("TeamID", "TEAM_02").invoke()
 					.then(function (oReturnValueContext) {
 						assert.strictEqual(oReturnValueContext.getPath(), "/EMPLOYEES('2')");
 					}),
@@ -16717,7 +16878,7 @@ sap.ui.define([
 
 			return Promise.all([
 				// code under test
-				oActionBinding.setParameter("TeamID", "TEAM_02").execute()
+				oActionBinding.setParameter("TeamID", "TEAM_02").invoke()
 					.then(function (oReturnValueContext) {
 						assert.strictEqual(oReturnValueContext.getPath(), "/EMPLOYEES('2')");
 					}),
@@ -16767,7 +16928,7 @@ sap.ui.define([
 
 			return Promise.all([
 				// code under test
-				oActionBinding.execute(),
+				oActionBinding.invoke(),
 				that.waitForChanges(assert)
 			]);
 		}).then(function () {
@@ -16786,7 +16947,7 @@ sap.ui.define([
 
 			return Promise.all([
 				// code under test
-				oActionBinding.execute().then(function (oReturnValueContext) {
+				oActionBinding.invoke().then(function (oReturnValueContext) {
 						assert.strictEqual(oReturnValueContext.getPath(), "/EMPLOYEES('2')");
 					}),
 				that.waitForChanges(assert)
@@ -16887,7 +17048,7 @@ sap.ui.define([
 					.setParameter("todate", "2017-08-10T23:59:59Z")
 					.setParameter("cityfrom", "new york")
 					.setParameter("cityto", "SAN FRANCISCO")
-					.execute(),
+					.invoke(),
 				that.waitForChanges(assert)
 			]).then(function () {
 				var oListBinding = oModel.bindList("value", oContextBinding.getBoundContext()),
@@ -16937,7 +17098,7 @@ sap.ui.define([
 				.expectChange("value", "2017-08-10T00:00:00Z");
 
 			return Promise.all([
-				that.oView.byId("function").getObjectBinding().execute(),
+				that.oView.byId("function").getObjectBinding().invoke(),
 				that.waitForChanges(assert)
 			]);
 		});
@@ -16967,7 +17128,7 @@ sap.ui.define([
 				});
 
 			return Promise.all([
-				oContextBinding.execute(),
+				oContextBinding.invoke(),
 				that.waitForChanges(assert)
 			]).then(function () {
 				var oListBinding = oModel.bindList("value", oContextBinding.getBoundContext()),
@@ -17017,7 +17178,7 @@ sap.ui.define([
 				});
 
 			return Promise.all([
-				oContextBinding.setParameter("carrid", "AA").execute(),
+				oContextBinding.setParameter("carrid", "AA").invoke(),
 				that.waitForChanges(assert)
 			]).then(function () {
 				var oListBinding = oModel.bindList("value", oContextBinding.getBoundContext()),
@@ -17090,7 +17251,7 @@ sap.ui.define([
 				.expectChange("distance", "2,572.0000");
 
 			return Promise.all([
-				that.oView.byId("function").getObjectBinding().execute(),
+				that.oView.byId("function").getObjectBinding().invoke(),
 				that.waitForChanges(assert)
 			]);
 		});
@@ -17129,7 +17290,7 @@ sap.ui.define([
 					.setParameter("guid", "0050568D-393C-1ED4-9D97-E65F0F3FCC23")
 					.setParameter("fldate", "2017-08-10T00:00:00Z")
 					.setParameter("flightTime", 42)
-					.execute(),
+					.invoke(),
 				that.waitForChanges(assert)
 			]);
 		}).then(function () {
@@ -17188,7 +17349,7 @@ sap.ui.define([
 				.expectChange("id1", "08/15");
 
 			return Promise.all([
-				oContextBinding.execute(),
+				oContextBinding.invoke(),
 				that.waitForChanges(assert)
 			]).then(function () {
 				assert.strictEqual(
@@ -17210,7 +17371,7 @@ sap.ui.define([
 
 		return this.createView(assert, "", oModel).then(function () {
 			//TODO In the V2 adapter case a function import is used instead of a bound action. So we
-			// need the key predicates which sometimes cannot be parsed from the URL. Trigger this
+			// need the key predicates which sometimes cannot be parsed from the URL. Invoke this
 			// request and wait for the result before calling the function import.
 			//TODO What about the ETag which might be got from this fresh request? Really use it?
 			that.expectRequest("SalesOrderLineItemSet(\'0815\',\'10\')/ToHeader", {
@@ -17232,7 +17393,7 @@ sap.ui.define([
 			return Promise.all([
 				// code under test
 				oModel.bindContext("GWSAMPLE_BASIC.SalesOrder_Confirm(...)", oParentContext)
-					.execute(),
+					.invoke(),
 				that.waitForChanges(assert)
 			]);
 		});
@@ -17285,7 +17446,7 @@ sap.ui.define([
 				.expectChange("newPhone", "+49 (0)2102 69555");
 
 			return Promise.all([
-				oContextBinding.setParameter("telephone", "+49 (0)2102 69555").execute(),
+				oContextBinding.setParameter("telephone", "+49 (0)2102 69555").invoke(),
 				that.waitForChanges(assert)
 			]);
 		});
@@ -18266,10 +18427,10 @@ sap.ui.define([
 	});
 
 	//*********************************************************************************************
-	// Scenario: Operation binding for a function, first it is deferred, later is has been executed.
-	//   Show interaction of execute() and suspend()/resume(); setParameter() has been tested
-	//   for refresh() already, see test "Function binding: setParameter, execute and refresh".
-	QUnit.test("Function binding: execute and suspend/resume", function (assert) {
+	// Scenario: Operation binding for a function, first it is deferred, later is has been invoked.
+	//   Show interaction of invoke() and suspend()/resume(); setParameter() has been tested
+	//   for refresh() already, see test "Function binding: setParameter, invoke and refresh".
+	QUnit.test("Function binding: invoke and suspend/resume", function (assert) {
 		var oEmployeeBinding,
 			sFunctionName = "com.sap.gateway.default.iwbep.tea_busi.v0001"
 				+ ".FuGetEmployeeSalaryForecast",
@@ -18304,7 +18465,7 @@ sap.ui.define([
 				.expectChange("forecastSalary", "142");
 
 			return Promise.all([
-				that.oView.byId("function").getObjectBinding().execute(),
+				that.oView.byId("function").getObjectBinding().invoke(),
 				that.waitForChanges(assert)
 			]);
 		}).then(function () {
@@ -18735,7 +18896,7 @@ sap.ui.define([
 				// code under test
 				that.oView.byId("function").getObjectBinding()
 					.setParameter("SalesOrderID", "0500000001")
-					.execute(),
+					.invoke(),
 				that.waitForChanges(assert)
 			]);
 		});
@@ -20099,7 +20260,7 @@ sap.ui.define([
 				.expectChange("active", [, "Yes"]);
 
 			return Promise.all([
-				oAction.execute(undefined, false, null, /*bReplaceWithRVC*/true),
+				oAction.invoke(undefined, false, null, /*bReplaceWithRVC*/true),
 				that.waitForChanges(assert, "replace with active")
 			]);
 		}).then(function (aResult) {
@@ -21097,7 +21258,7 @@ sap.ui.define([
 	});
 
 	//*********************************************************************************************
-	QUnit.test("delayed execute", function (assert) {
+	QUnit.test("delayed invoke", function (assert) {
 		var sAction = "SalesOrderList('0500000000')/"
 				+ "com.sap.gateway.default.zui5_epm_sample.v0002.SalesOrder_Cancel",
 			oModel = this.createSalesOrdersModel(),
@@ -21112,7 +21273,7 @@ sap.ui.define([
 				}, {SalesOrderID : "0500000000"});
 
 			return Promise.all([
-				that.oView.byId("form").getElementBinding().execute("update"),
+				that.oView.byId("form").getElementBinding().invoke("update"),
 				that.oModel.submitBatch("update"),
 				that.waitForChanges(assert)
 			]);
@@ -21121,7 +21282,7 @@ sap.ui.define([
 
 	//*********************************************************************************************
 	// Scenario: Refresh using a group with submit mode 'API'. The view contains one context binding
-	// without children. Hence the binding doesn't trigger a request, but its lock must be released.
+	// without children. Hence the binding doesn't invoke a request, but its lock must be released.
 	QUnit.test("ODCB: delayed refresh", function (assert) {
 		var oModel = this.createSalesOrdersModel({autoExpandSelect : true}),
 			sView = `
@@ -21157,7 +21318,7 @@ sap.ui.define([
 
 	//*********************************************************************************************
 	// Scenario: Refresh using a group with submit mode 'API'. The model contains one list binding
-	// without a control. Hence getContexts() is not called and no request is triggered. But the
+	// without a control. Hence getContexts() is not called and no request is invoked. But the
 	// lock must be released.
 	QUnit.test("ODLB: delayed refresh", function (assert) {
 		var oModel = this.createSalesOrdersModel({autoExpandSelect : true}),
@@ -25431,6 +25592,12 @@ sap.ui.define([
 				[true, undefined, 1, "Friend #01"]
 			]);
 
+			// Since CPOUI5ODATAV4-2493 selecting a header context will select all row contexts.
+			// This behavior is undesired for this test scenario. Remove the selection but select
+			// back the root node.
+			oHeaderContext.setSelected(false);
+			oRoot.setSelected(true);
+
 			assert.strictEqual(oListBinding.getCount(), 1, "count of nodes"); // code under test
 
 			that.expectRequest("Artists(ArtistID='0',IsActiveEntity=true)?$select=defaultChannel", {
@@ -26107,7 +26274,7 @@ sap.ui.define([
 	//*********************************************************************************************
 	// Scenario: Show a recursive hierarchy with a single root node, expand to show a single child.
 	// Edit non-hierarchy property with associated currency, also w/o sending a PATCH, for both root
-	// and child. Execute a bound action for both root and child to see that it updates the node.
+	// and child. Invoke a bound action for both root and child to see that it updates the node.
 	// JIRA: CPOUI5ODATAV4-1851
 	//
 	// Use relative ODLB with an initially suspended parent (JIRA: CPOUI5ODATAV4-1985 etc.)
@@ -26306,7 +26473,7 @@ sap.ui.define([
 			return Promise.all([
 				oModel.bindContext(sAction + "(...)", oRoot)
 					.setParameter("TeamID", "TEAM_23")
-					.execute()
+					.invoke()
 					.then(function (oReturnValueContext) {
 						assert.strictEqual(oRoot.getPath(),
 							"/TEAMS('42')/TEAM_2_EMPLOYEES('0')");
@@ -26315,7 +26482,7 @@ sap.ui.define([
 					}),
 				oModel.bindContext(sAction + "(...)", oChild)
 					.setParameter("TeamID", "TEAM_42")
-					.execute()
+					.invoke()
 					.then(function (oReturnValueContext) {
 						// Note: RVC has iGeneration === 2 instead of 0
 						assert.notStrictEqual(oReturnValueContext, oChild);
@@ -28638,10 +28805,16 @@ sap.ui.define([
 		await this.createView(assert, sView, oModel);
 
 		const oTable = this.oView.byId("table");
+		const oAlpha = oTable.getItems()[0].getBindingContext();
+
+		assert.throws(function () {
+			oAlpha.delete("deferred"); // code under test
+		}, new Error("Unsupported group ID: deferred"));
+
 		this.expectRequest("DELETE EMPLOYEES('0')");
 
 		await Promise.all([
-			oTable.getItems()[0].getBindingContext().delete(), // code under test
+			oAlpha.delete(), // code under test
 			this.waitForChanges(assert, "delete")
 		]);
 
@@ -29899,6 +30072,7 @@ sap.ui.define([
 	// Create a new root via "@$ui5.node.parent" : null (JIRA: CPOUI5ODATAV4-2355)
 	// Move "Beta" to make it a root node (JIRA: CPOUI5ODATAV4-2399)
 	// Display NodeID on UI, request NodeID after creation (JIRA: CPOUI5ODATAV4-2381)
+	// NodeID must ignore list's filters (SNOW: DINC0087713)
 	//
 	// "Refresh single" for stale elements; keep same context instance for created nodes throughout
 	// collapse and side effects.
@@ -29911,15 +30085,17 @@ sap.ui.define([
 
 		const oModel = this.createSpecialCasesModel({autoExpandSelect : true});
 		const sFriend = "/Artists(ArtistID='99',IsActiveEntity=false)/_Friend";
-		const sBaseUrl = sFriend.slice(1) + "?$apply=com.sap.vocabularies.Hierarchy.v1.TopLevels("
-			+ "HierarchyNodes=$root" + sFriend
+		const sBaseUrl = sFriend.slice(1) + "?$apply=ancestors($root" + sFriend
+			+ ",OrgChart,_/NodeID,filter(sendsAutographs),keep start)"
+			+ "/com.sap.vocabularies.Hierarchy.v1.TopLevels(HierarchyNodes=$root" + sFriend
 			+ ",HierarchyQualifier='OrgChart',NodeProperty='_/NodeID',Levels=1)";
 		const sView = `
 <t:Table id="table" rows="{path : '/Artists(ArtistID=\\'99\\',IsActiveEntity=false)/_Friend',
 		parameters : {
 			$$aggregation : {
 				hierarchyQualifier : 'OrgChart'
-			}
+			},
+			$filter : 'sendsAutographs'
 		}}" threshold="0" visibleRowCount="3">
 	<Text text="{= %{@$ui5.context.isTransient} }"/>
 	<Text text="{= %{@$ui5.node.isExpanded} }"/>
@@ -29953,6 +30129,10 @@ sap.ui.define([
 			oTable = that.oView.byId("table");
 			oRoot = oTable.getRows()[0].getBindingContext();
 			oListBinding = oRoot.getBinding();
+			assert.throws(function () {
+				// code under test
+				oListBinding.getHeaderContext().move();
+			}, new Error("Cannot move " + sFriend));
 
 			checkTable("root is leaf", assert, oTable, [
 				sFriend + "(ArtistID='0',IsActiveEntity=false)"
@@ -29994,6 +30174,10 @@ sap.ui.define([
 				Name : "Beta"
 			}, /*bSkipRefresh*/true);
 			oBetaCreated = oBeta.created();
+			assert.throws(function () {
+				// code under test
+				oBeta.move();
+			}, new Error("Cannot move " + oBeta), "too early");
 
 			return Promise.all([
 				checkCanceled(assert, oLostChild.created()),
@@ -30011,6 +30195,7 @@ sap.ui.define([
 
 			that.expectChange("etag", [, "etag1.0"])
 				.expectChange("name", [, "Beta: β"])
+				// no "filter(sendsAutographs)" (SNOW: DINC0087713)
 				.expectRequest(sFriend.slice(1) + "?$apply=descendants($root" + sFriend
 					+ ",OrgChart,_/NodeID,filter(ArtistID eq '0' and IsActiveEntity eq false),1)"
 					+ "&$filter=ArtistID eq '1' and IsActiveEntity eq false&$select=_/NodeID", {
@@ -30075,6 +30260,7 @@ sap.ui.define([
 				})
 				.expectChange("etag", [, "etag2.0"])
 				.expectChange("name", [, "Gamma: γ"])
+				// no "filter(sendsAutographs)" (SNOW: DINC0087713)
 				.expectRequest(sFriend.slice(1) + "?$apply=descendants($root" + sFriend
 					+ ",OrgChart,_/NodeID,filter(ArtistID eq '0' and IsActiveEntity eq false),1)"
 					+ "&$filter=ArtistID eq '2' and IsActiveEntity eq false&$select=_/NodeID", {
@@ -30253,8 +30439,9 @@ sap.ui.define([
 			assert.strictEqual(oBeta.getModel(), oModel, "not destroyed by collapse");
 			assert.strictEqual(oGamma.getModel(), oModel, "not destroyed by collapse");
 
-			that.expectRequest(sFriend.slice(1) + "?$select=ArtistID,IsActiveEntity,Name,_/NodeID"
-					+ "&$filter=ArtistID eq '0' and IsActiveEntity eq false", {
+			that.expectRequest(sFriend.slice(1)
+					+ "?$filter=ArtistID eq '0' and IsActiveEntity eq false"
+					+ "&$select=ArtistID,IsActiveEntity,Name,_/NodeID", {
 					value : [{
 						"@odata.etag" : "etag0.1",
 						ArtistID : "0",
@@ -30431,7 +30618,10 @@ sap.ui.define([
 				})
 				.expectChange("etag", ["etag9.0"])
 				.expectChange("name", ["Aleph: ℵ"])
-				.expectRequest(sBaseUrl
+				// no "filter(sendsAutographs)" (SNOW: DINC0087713)
+				.expectRequest(sFriend.slice(1) + "?$apply="
+					+ "com.sap.vocabularies.Hierarchy.v1.TopLevels(HierarchyNodes=$root" + sFriend
+					+ ",HierarchyQualifier='OrgChart',NodeProperty='_/NodeID',Levels=1)"
 					+ "&$filter=ArtistID eq '9' and IsActiveEntity eq false&$select=_/NodeID", {
 					value : [{
 						"@odata.etag" : "etag9.0",
@@ -30466,11 +30656,12 @@ sap.ui.define([
 			]);
 			checkCreatedPersisted(assert, oNewRoot);
 
-			that.expectRequest(sFriend.slice(1) + "?$select=ArtistID,IsActiveEntity,Name,_/NodeID"
-					+ "&$filter=ArtistID eq '9' and IsActiveEntity eq false"
+			that.expectRequest(sFriend.slice(1)
+					+ "?$filter=ArtistID eq '9' and IsActiveEntity eq false"
 					+ " or ArtistID eq '0' and IsActiveEntity eq false"
 					+ " or ArtistID eq '2' and IsActiveEntity eq false"
 					+ " or ArtistID eq '1' and IsActiveEntity eq false"
+					+ "&$select=ArtistID,IsActiveEntity,Name,_/NodeID"
 					+ "&$top=4", {
 					value : [{
 						"@odata.etag" : "etag9.1",
@@ -30577,15 +30768,16 @@ sap.ui.define([
 
 	//*********************************************************************************************
 	// Scenario: Create a new node when all levels are expanded, observe a GET for LimitedRank. The
-	// created node is inserted on the second sibling position on back end, but is shown on the
-	// client on first position. Use a filter and a search as well as a sort order. Before creation,
-	// a sibling is collapsed and after creation it is expanded again. The root is collapsed and
-	// immediately expanded again. Finally, the new node is deleted again.
+	// created node is inserted on the second sibling position on back end and is shown on the
+	// client "in place" (JIRA: CPOUI5ODATAV4-2466). Use a filter and a search as well as a sort
+	// order. Before creation, a sibling is collapsed and after creation it is expanded again. The
+	// root is collapsed and immediately expanded again. Finally, the new node is deleted again.
 	// JIRA: CPOUI5ODATAV4-2393
 	//
 	// Before deletion, the new node is maybe moved to make it a root (JIRA: CPOUI5ODATAV4-2400)
 	// Old vs. new format of RecursiveHierarchy annotation (JIRA: CPOUI5ODATAV4-2401)
 	// Display NodeID on UI, request NodeID after creation (JIRA: CPOUI5ODATAV4-2381)
+	// NodeID must ignore list's filters (SNOW: DINC0087713)
 	//
 	// At first, create a new root node with a LimitedRank beyond all currently loaded nodes.
 	// Finally, it is also deleted.
@@ -30700,11 +30892,27 @@ make root = ${bMakeRoot}`;
 				Name : "Aleph",
 				_ : null // not available w/ RAP for a non-hierarchical request
 			})
-			.expectRequest(sBaseUrl + "&$filter=ArtistID eq '8' and IsActiveEntity eq false"
-				+ "&$select=_/" + sLimitedRank + ",_/NodeID", {
+			.expectRequest({
+				batchNo : 3,
+				url : sBaseUrl + "&$filter=ArtistID eq '8' and IsActiveEntity eq false"
+					+ "&$select=_/" + sLimitedRank
+			}, {
+				value : [{
+					_ : {
+						[sLimitedRank] : "10" // Edm.Int64
+					}
+				}]
+			})
+			.expectRequest({
+				batchNo : 3,
+				// no "filter(...)/search(...)" (SNOW: DINC0087713)
+				url : sFriend.slice(1) + "?$apply="
+					+ "com.sap.vocabularies.Hierarchy.v1.TopLevels(HierarchyNodes=$root" + sFriend
+					+ ",HierarchyQualifier='" + sHierarchyQualifier + "',NodeProperty='_/NodeID')"
+					+ "&$filter=ArtistID eq '8' and IsActiveEntity eq false&$select=_/NodeID"
+			}, {
 				value : [{
 					_ : {
-						[sLimitedRank] : "10", // Edm.Int64
 						NodeID : "8,false"
 					}
 				}]
@@ -30845,11 +31053,27 @@ make root = ${bMakeRoot}`;
 				Name : "New",
 				_ : null // not available w/ RAP for a non-hierarchical request
 			})
-			.expectRequest(sBaseUrl + "&$filter=ArtistID eq '9' and IsActiveEntity eq false"
-				+ "&$select=_/" + sLimitedRank + ",_/NodeID", {
+			.expectRequest({
+				batchNo : 7,
+				url : sBaseUrl + "&$filter=ArtistID eq '9' and IsActiveEntity eq false"
+					+ "&$select=_/" + sLimitedRank
+			}, {
+				value : [{
+					_ : {
+						[sLimitedRank] : "4" // Edm.Int64
+					}
+				}]
+			})
+			.expectRequest({
+				batchNo : 7,
+				// no "filter(...)/search(...)" (SNOW: DINC0087713)
+				url : sFriend.slice(1) + "?$apply="
+					+ "com.sap.vocabularies.Hierarchy.v1.TopLevels(HierarchyNodes=$root" + sFriend
+					+ ",HierarchyQualifier='" + sHierarchyQualifier + "',NodeProperty='_/NodeID')"
+					+ "&$filter=ArtistID eq '9' and IsActiveEntity eq false&$select=_/NodeID"
+			}, {
 				value : [{
 					_ : {
-						[sLimitedRank] : "4", // Edm.Int64
 						NodeID : "9,false"
 					}
 				}]
@@ -31005,9 +31229,10 @@ make root = ${bMakeRoot}`;
 				this.waitForChanges(assert, "make New a root node")
 			]);
 
+			checkPersisted(assert, oNewChild);
+
 			await this.checkAllContexts("after make New a root node", assert, oListBinding,
 				["@$ui5.node.isExpanded", "@$ui5.node.level", "ArtistID", "Name", "_/NodeID"], [
-					[undefined, 1, "9", "New", "9,false"],
 					[undefined, 1, "8", "Aleph", "8,false"],
 					[true, 1, "0", "Alpha", "0,false"],
 					[undefined, 2, "1", "Beta", "1,false"],
@@ -31018,16 +31243,24 @@ make root = ${bMakeRoot}`;
 					[undefined, 3, "5.1", "Eta", "5.1,false"],
 					[undefined, 3, "5.2", "Theta", "5.2,false"],
 					[undefined, 2, "6", "Iota", "6,false"],
-					[undefined, 2, "7", "Kappa", "7,false"]
+					[undefined, 2, "7", "Kappa", "7,false"],
+					[undefined, 1, "9", "New", "9,false"]
 				]);
 		}
 
 		this.expectRequest("DELETE Artists(ArtistID='8',IsActiveEntity=false)")
 			.expectRequest("DELETE Artists(ArtistID='9',IsActiveEntity=false)");
 
-		await Promise.all([
+		// code under test
+		const oDeleteNewRootPromise = oNewRoot.delete();
+
+		assert.throws(function () {
 			// code under test
-			oNewRoot.delete(),
+			oNewRoot.move();
+		}, new Error("Cannot move " + oNewRoot), "too late");
+
+		await Promise.all([
+			oDeleteNewRootPromise,
 			// code under test
 			oNewChild.delete(),
 			this.waitForChanges(assert, "delete New")
@@ -31853,7 +32086,7 @@ make root = ${bMakeRoot}`;
 	});
 
 	//*********************************************************************************************
-	// Scenario: A hierarchy has an initial expandTo=1 and three visible rows. Expand and collapse
+	// Scenario: A hierarchy has an initial expand all and three visible rows. Expand and collapse
 	// various nodes and request side effects.
 	// (1) Collapse Beta -> Alpha, Beta, Delta
 	// (2) Request side effects -> Delta is removed -> Alpha, Beta, Epsilon
@@ -32258,22 +32491,32 @@ make root = ${bMakeRoot}`;
 	//     create New6 below New3
 	// (3) Side-effects refresh (-> unified cache; New2 is already read in-place, it is shifted when
 	//     moving New1 to its out-of-place position; Beta is already read in-place, but shifted
-	//     when moving New1 and New3; Gamma is only placeholder when moving New5)
+	//     when moving New1 and New3; Gamma is only placeholder when moving New5).
+	//     Additionally request the first row in parallel just like the tree table occasionally
+	//     does, this must not cause further requests.
 	// (4) Check all contexts
-	// (5) Refresh the binding (out of place is no longer kept, tree is collapsed again to 1 level)
+	// (5) Delete New1 (no longer requested as out-of-place node afterward)
+	// (6) Side-effects refresh (moves New3 below Gamma)
+	// (7) Check all contexts
+	// (8) Side-effects refresh (New3 and New6 are no longer requested as out-of-place nodes)
+	// (9) Delete Alpha
+	// (10) Side-effects refresh (expand state and out-of-place information are dropped for Alpha's
+	//      descendants)
+	// (11) Refresh the binding (out-of-place information is no longer kept, tree is collapsed again
+	//      to 1 level)
 	// JIRA: CPOUI5ODATAV4-2454
 	QUnit.test("Recursive Hierarchy: out of place", async function (assert) {
 		const oModel = this.createSpecialCasesModel({autoExpandSelect : true});
-		const sFriend = "/Artists(ArtistID='99',IsActiveEntity=false)/_Friend";
+		const sFriend = "Artists(ArtistID='99',IsActiveEntity=false)/_Friend";
 		const sFilterSearchPrefix = "ancestors("
-			+ "$root" + sFriend + ",OrgChart,_/NodeID,"
+			+ "$root/" + sFriend + ",OrgChart,_/NodeID,"
 			+ "filter(IsActiveEntity eq false)/search(covfefe),keep start)/";
-		const baseUrl = (sExpandLevels) => sFriend.slice(1)
+		const baseUrl = (sExpandLevels) => sFriend
 			+ "?custom=foo&$apply=" + sFilterSearchPrefix + "orderby(defaultChannel)"
-			+ "/com.sap.vocabularies.Hierarchy.v1.TopLevels(HierarchyNodes=$root" + sFriend
+			+ "/com.sap.vocabularies.Hierarchy.v1.TopLevels(HierarchyNodes=$root/" + sFriend
 			+ ",HierarchyQualifier='OrgChart',NodeProperty='_/NodeID',Levels=1"
 			+ (sExpandLevels ? ",ExpandLevels=" + sExpandLevels : "") + ")";
-		const sCountUrl = sFriend.slice(1) + "/$count?$filter=IsActiveEntity eq false&custom=foo"
+		const sCountUrl = sFriend + "/$count?$filter=IsActiveEntity eq false&custom=foo"
 			+ "&$search=covfefe";
 		const sExpandLevels = JSON.stringify([
 			{NodeID : "1,false", Levels : 1},
@@ -32281,6 +32524,10 @@ make root = ${bMakeRoot}`;
 			{NodeID : "3,false", Levels : 1},
 			{NodeID : "13,false", Levels : 1}
 		]);
+		const sExpandLevelsAfterDelete = JSON.stringify([
+			{NodeID : "3,false", Levels : 1},
+			{NodeID : "13,false", Levels : 1}
+		]);
 		const sView = `
 <t:Table id="table" rows="{path : '/Artists(ArtistID=\\'99\\',IsActiveEntity=false)/_Friend',
 		parameters : {
@@ -32299,17 +32546,17 @@ make root = ${bMakeRoot}`;
 	<Text text="{Name}"/>
 </t:Table>`;
 
-		// Server:                          UI:
-		// 1 Alpha                          1 Alpha
-		//   12 New2 (created)                13 New3 (created)
-		//    2 Beta                             16 New6 (created)
-		//      14 New4 (created)             12 New2 (created)
-		//   11 New1 (created)                11 New1 (created)
-		//   13 New3 (created)                 2 Beta
-		//      16 New6 (created)                14 New4 (created)
-		// 3 Gamma                          3 Gamma
-		//   15 New5 (created)                15 New5 (created)
-		// 4 Delta                          4 Delta
+		// Server:               UI:
+		// 1 Alpha               1 Alpha
+		//   12 New2               13 New3
+		//    2 Beta                  16 New6
+		//      14 New4            12 New2
+		//   11 New1               11 New1
+		//   13 New3                2 Beta
+		//      16 New6               14 New4
+		// 3 Gamma               3 Gamma
+		//   15 New5               15 New5
+		// 4 Delta               4 Delta
 		this.expectRequest(sCountUrl, 4)
 			.expectRequest(baseUrl()
 				+ "&$select=ArtistID,IsActiveEntity,Name,_/DrillState,_/NodeID"
@@ -32347,9 +32594,9 @@ make root = ${bMakeRoot}`;
 		const oTable = this.oView.byId("table");
 		const oBinding = oTable.getBinding("rows");
 		checkTable("initial page", assert, oTable, [
-			sFriend + "(ArtistID='1',IsActiveEntity=false)",
-			sFriend + "(ArtistID='3',IsActiveEntity=false)",
-			sFriend + "(ArtistID='4',IsActiveEntity=false)"
+			`/${sFriend}(ArtistID='1',IsActiveEntity=false)`,
+			`/${sFriend}(ArtistID='3',IsActiveEntity=false)`,
+			`/${sFriend}(ArtistID='4',IsActiveEntity=false)`
 		], [
 			[false, 1, "1", "Alpha"],
 			[undefined, 1, "3", "Gamma"],
@@ -32358,8 +32605,8 @@ make root = ${bMakeRoot}`;
 		const oAlpha = oTable.getRows()[0].getBindingContext();
 		const oGamma = oTable.getRows()[1].getBindingContext();
 
-		this.expectRequest(sFriend.slice(1) + "?custom=foo&$apply=" + sFilterSearchPrefix
-				+ "descendants($root/" + sFriend.slice(1)
+		this.expectRequest(sFriend + "?custom=foo&$apply=" + sFilterSearchPrefix
+				+ "descendants($root/" + sFriend
 				+ ",OrgChart,_/NodeID,filter(ArtistID eq '1' and IsActiveEntity eq false),1)"
 				+ "/orderby(defaultChannel)"
 				+ "&$select=ArtistID,IsActiveEntity,Name,_/DrillState,_/NodeID"
@@ -32381,10 +32628,10 @@ make root = ${bMakeRoot}`;
 		await this.waitForChanges(assert, "(1) expand Alpha");
 
 		checkTable("after (1)", assert, oTable, [
-			sFriend + "(ArtistID='1',IsActiveEntity=false)",
-			sFriend + "(ArtistID='2',IsActiveEntity=false)",
-			sFriend + "(ArtistID='3',IsActiveEntity=false)",
-			sFriend + "(ArtistID='4',IsActiveEntity=false)"
+			`/${sFriend}(ArtistID='1',IsActiveEntity=false)`,
+			`/${sFriend}(ArtistID='2',IsActiveEntity=false)`,
+			`/${sFriend}(ArtistID='3',IsActiveEntity=false)`,
+			`/${sFriend}(ArtistID='4',IsActiveEntity=false)`
 		], [
 			[true, 1, "1", "Alpha"],
 			[undefined, 2, "2", "Beta"],
@@ -32396,7 +32643,7 @@ make root = ${bMakeRoot}`;
 			const sParentId = oParent.getProperty("ArtistID");
 			this.expectRequest({
 					method : "POST",
-					url : sFriend.slice(1) + "?custom=foo",
+					url : sFriend + "?custom=foo",
 					payload : {
 						"BestFriend@odata.bind" :
 							`../Artists(ArtistID='${sParentId}',IsActiveEntity=false)`,
@@ -32408,11 +32655,10 @@ make root = ${bMakeRoot}`;
 					Name : sName,
 					_ : null // not available w/ RAP for a non-hierarchical request
 				})
-				.expectRequest(sFriend.slice(1) + "?$apply=" + sFilterSearchPrefix
-					+ "descendants($root/" + sFriend.slice(1)
+				// no sFilterSearchPrefix (SNOW: DINC0087713)
+				.expectRequest(sFriend + "?custom=foo&$apply=descendants($root/" + sFriend
 					+ ",OrgChart,_/NodeID,filter(ArtistID eq '" + sParentId
 					+ "' and IsActiveEntity eq false),1)"
-					+ "/orderby(defaultChannel)"
 					+ "&$filter=ArtistID eq '" + sId
 					+ "' and IsActiveEntity eq false&$select=_/NodeID", {
 					value : [{
@@ -32422,14 +32668,17 @@ make root = ${bMakeRoot}`;
 					}]
 				});
 
-				const oContext = oBinding.create({
-					"@$ui5.node.parent" : oParent,
-					Name : sName
-				}, /*bSkipRefresh*/true);
+			const oContext = oBinding.create({
+				"@$ui5.node.parent" : oParent,
+				Name : sName
+			}, /*bSkipRefresh*/true);
 
-				await oContext.created();
+			await Promise.all([
+				oContext.created(),
+				this.waitForChanges(assert, `(2) create ${sName}`)
+			]);
 
-				return oContext;
+			return oContext;
 		};
 
 		await create("11", "New1", oAlpha);
@@ -32437,24 +32686,19 @@ make root = ${bMakeRoot}`;
 		const oNew3 = await create("13", "New3", oAlpha);
 		await create("14", "New4", oBeta);
 		await create("15", "New5", oGamma);
-
-		await this.waitForChanges(assert, "(2a) create nodes");
-
-		const oNew6 = await create("16", "New6", oNew3);
-
-		await this.waitForChanges(assert, "(2b) create nested node");
+		const oNew6 = await create("16", "New6", oNew3); // nested below New3
 
 		checkTable("after (2)", assert, oTable, [
-			sFriend + "(ArtistID='1',IsActiveEntity=false)",
-			sFriend + "(ArtistID='13',IsActiveEntity=false)",
-			sFriend + "(ArtistID='16',IsActiveEntity=false)",
-			sFriend + "(ArtistID='12',IsActiveEntity=false)",
-			sFriend + "(ArtistID='11',IsActiveEntity=false)",
-			sFriend + "(ArtistID='2',IsActiveEntity=false)",
-			sFriend + "(ArtistID='14',IsActiveEntity=false)",
-			sFriend + "(ArtistID='3',IsActiveEntity=false)",
-			sFriend + "(ArtistID='15',IsActiveEntity=false)",
-			sFriend + "(ArtistID='4',IsActiveEntity=false)"
+			`/${sFriend}(ArtistID='1',IsActiveEntity=false)`,
+			`/${sFriend}(ArtistID='13',IsActiveEntity=false)`,
+			`/${sFriend}(ArtistID='16',IsActiveEntity=false)`,
+			`/${sFriend}(ArtistID='12',IsActiveEntity=false)`,
+			`/${sFriend}(ArtistID='11',IsActiveEntity=false)`,
+			`/${sFriend}(ArtistID='2',IsActiveEntity=false)`,
+			`/${sFriend}(ArtistID='14',IsActiveEntity=false)`,
+			`/${sFriend}(ArtistID='3',IsActiveEntity=false)`,
+			`/${sFriend}(ArtistID='15',IsActiveEntity=false)`,
+			`/${sFriend}(ArtistID='4',IsActiveEntity=false)`
 		], [
 			[true, 1, "1", "Alpha"],
 			[true, 2, "13", "New3"],
@@ -32603,7 +32847,7 @@ make root = ${bMakeRoot}`;
 			})
 			.expectRequest({
 				batchNo : 15,
-				url : sFriend.slice(1) + "?custom=foo&$apply=descendants($root/" + sFriend.slice(1)
+				url : sFriend + "?custom=foo&$apply=descendants($root/" + sFriend
 					+ ",OrgChart,_/NodeID,filter(ArtistID eq '1' and IsActiveEntity eq false),1)"
 					+ "&$select=ArtistID,IsActiveEntity,Name,_/NodeID"
 					+ "&$filter=ArtistID eq '11' and IsActiveEntity eq false"
@@ -32636,7 +32880,7 @@ make root = ${bMakeRoot}`;
 			})
 			.expectRequest({
 				batchNo : 15,
-				url : sFriend.slice(1) + "?custom=foo&$apply=descendants($root/" + sFriend.slice(1)
+				url : sFriend + "?custom=foo&$apply=descendants($root/" + sFriend
 					+ ",OrgChart,_/NodeID,filter(ArtistID eq '2' and IsActiveEntity eq false),1)"
 					+ "&$select=ArtistID,IsActiveEntity,Name,_/NodeID"
 					+ "&$filter=ArtistID eq '14' and IsActiveEntity eq false"
@@ -32653,7 +32897,7 @@ make root = ${bMakeRoot}`;
 			})
 			.expectRequest({
 				batchNo : 15,
-				url : sFriend.slice(1) + "?custom=foo&$apply=descendants($root/" + sFriend.slice(1)
+				url : sFriend + "?custom=foo&$apply=descendants($root/" + sFriend
 					+ ",OrgChart,_/NodeID,filter(ArtistID eq '3' and IsActiveEntity eq false),1)"
 					+ "&$select=ArtistID,IsActiveEntity,Name,_/NodeID"
 					+ "&$filter=ArtistID eq '15' and IsActiveEntity eq false"
@@ -32670,7 +32914,7 @@ make root = ${bMakeRoot}`;
 			})
 			.expectRequest({
 				batchNo : 15,
-				url : sFriend.slice(1) + "?custom=foo&$apply=descendants($root/" + sFriend.slice(1)
+				url : sFriend + "?custom=foo&$apply=descendants($root/" + sFriend
 					+ ",OrgChart,_/NodeID,filter(ArtistID eq '13' and IsActiveEntity eq false),1)"
 					+ "&$select=ArtistID,IsActiveEntity,Name,_/NodeID"
 					+ "&$filter=ArtistID eq '16' and IsActiveEntity eq false"
@@ -32689,18 +32933,20 @@ make root = ${bMakeRoot}`;
 		await Promise.all([
 			// code under test
 			oBinding.getHeaderContext().requestSideEffects([""]),
+			// code under test: requesting one row already covered by side-effects refresh
+			oBinding.getContexts(0, 1),
 			this.waitForChanges(assert, "(3) side-effects refresh")
 		]);
 
 		checkTable("after (3)", assert, oTable, [
-			sFriend + "(ArtistID='1',IsActiveEntity=false)",
-			sFriend + "(ArtistID='13',IsActiveEntity=false)",
-			sFriend + "(ArtistID='16',IsActiveEntity=false)",
-			sFriend + "(ArtistID='12',IsActiveEntity=false)",
-			sFriend + "(ArtistID='11',IsActiveEntity=false)",
-			sFriend + "(ArtistID='2',IsActiveEntity=false)",
-			sFriend + "(ArtistID='14',IsActiveEntity=false)",
-			sFriend + "(ArtistID='15',IsActiveEntity=false)"
+			`/${sFriend}(ArtistID='1',IsActiveEntity=false)`,
+			`/${sFriend}(ArtistID='13',IsActiveEntity=false)`,
+			`/${sFriend}(ArtistID='16',IsActiveEntity=false)`,
+			`/${sFriend}(ArtistID='12',IsActiveEntity=false)`,
+			`/${sFriend}(ArtistID='11',IsActiveEntity=false)`,
+			`/${sFriend}(ArtistID='2',IsActiveEntity=false)`,
+			`/${sFriend}(ArtistID='14',IsActiveEntity=false)`,
+			`/${sFriend}(ArtistID='15',IsActiveEntity=false)`
 		], [
 			[true, 1, "1", "Alpha*"],
 			[true, 2, "13", "New3*"],
@@ -32757,23 +33003,595 @@ make root = ${bMakeRoot}`;
 				[undefined, 1, "4", "Delta*"]
 			]);
 
-		this.expectRequest(sCountUrl, 10)
-			.expectRequest(baseUrl()
-				+ "&$select=ArtistID,IsActiveEntity,Name,_/DrillState,_/NodeID"
+		// this context has been destroyed by the refresh because it was not visible
+		const [oNew1] = await oBinding.requestContexts(4, 1);
+
+		this.expectRequest("DELETE Artists(ArtistID='11',IsActiveEntity=false)");
+
+		await Promise.all([
+			// code under test
+			oNew1.delete(),
+			this.waitForChanges(assert, "(5) delete New1")
+		]);
+
+		// After deleting New1 & side-effects refresh
+		// Server:                          UI:
+		// 1 Alpha                          1 Alpha
+		//   12 New2                          12 New2 (out of place)
+		//    2 Beta                           2 Beta
+		//      14 New4                          14 New4 (out of place)
+		// 3 Gamma                          3 Gamma
+		//   13 New3 (moved)                  15 New5 (out of place)
+		//      16 New6                       13 New3 (moved)
+		//   15 New5                             16 New6
+		// 4 Delta                          4 Delta
+
+		this.expectRequest(sCountUrl, 9)
+			.expectRequest(baseUrl(sExpandLevels)
+				+ "&$select=ArtistID,IsActiveEntity,Name,_/DescendantCount,_/DistanceFromRoot"
+				+ ",_/DrillState,_/NodeID"
 				+ "&$count=true&$skip=0&$top=3", {
-				"@odata.count" : "3",
+				"@odata.count" : "9",
 				value : [{
 					ArtistID : "1",
 					IsActiveEntity : false,
 					Name : "Alpha**",
 					_ : {
-						DrillState : "collapsed",
+						DescendantCount : "3",
+						DistanceFromRoot : "0",
+						DrillState : "expanded",
+						NodeID : "1,false"
+					}
+				}, {
+					ArtistID : "12",
+					IsActiveEntity : false,
+					Name : "New2**",
+					_ : {
+						DescendantCount : "0",
+						DistanceFromRoot : "1",
+						DrillState : "leaf",
+						NodeID : "12,false"
+					}
+				}, {
+					ArtistID : "2",
+					IsActiveEntity : false,
+					Name : "Beta**",
+					_ : {
+						DescendantCount : "1",
+						DistanceFromRoot : "1",
+						DrillState : "expanded",
+						NodeID : "2,false"
+					}
+				}]
+			})
+			.expectRequest(baseUrl(sExpandLevels)
+				+ "&$select=ArtistID,IsActiveEntity,_/DescendantCount,_/DistanceFromRoot"
+				+ ",_/DrillState,_/Limited_Rank"
+				+ "&$filter=ArtistID eq '1' and IsActiveEntity eq false"
+				+ " or ArtistID eq '12' and IsActiveEntity eq false"
+				+ " or ArtistID eq '13' and IsActiveEntity eq false"
+				+ " or ArtistID eq '14' and IsActiveEntity eq false"
+				+ " or ArtistID eq '15' and IsActiveEntity eq false"
+				+ " or ArtistID eq '16' and IsActiveEntity eq false"
+				+ " or ArtistID eq '2' and IsActiveEntity eq false"
+				+ " or ArtistID eq '3' and IsActiveEntity eq false"
+				+ "&$top=8", {
+				value : [{
+					ArtistID : "1",
+					IsActiveEntity : false,
+					_ : {
+						DescendantCount : "3",
+						DistanceFromRoot : "n/a", // parent's DistanceFromRoot is not yet relevant
+						DrillState : "expanded",
+						Limited_Rank : "0"
+					}
+				}, {
+					ArtistID : "12",
+					IsActiveEntity : false,
+					_ : {
+						DescendantCount : "0",
+						DistanceFromRoot : "1",
+						DrillState : "leaf",
+						Limited_Rank : "1"
+					}
+				}, {
+					ArtistID : "2",
+					IsActiveEntity : false,
+					_ : {
+						DescendantCount : "1",
+						DistanceFromRoot : "n/a", // parent's DistanceFromRoot is not yet relevant
+						DrillState : "expanded",
+						Limited_Rank : "2"
+					}
+				}, {
+					ArtistID : "14",
+					IsActiveEntity : false,
+					_ : {
+						DescendantCount : "0",
+						DistanceFromRoot : "2",
+						DrillState : "leaf",
+						Limited_Rank : "3"
+					}
+				}, {
+					ArtistID : "3",
+					IsActiveEntity : false,
+					_ : {
+						DescendantCount : "3",
+						DistanceFromRoot : "n/a", // parent's DistanceFromRoot is not yet relevant
+						DrillState : "expanded",
+						Limited_Rank : "4"
+					}
+				}, {
+					ArtistID : "13",
+					IsActiveEntity : false,
+					_ : {
+						DescendantCount : "1",
+						DistanceFromRoot : "1",
+						DrillState : "expanded",
+						Limited_Rank : "5"
+					}
+				}, {
+					ArtistID : "16",
+					IsActiveEntity : false,
+					_ : {
+						DescendantCount : "0",
+						DistanceFromRoot : "2",
+						DrillState : "leaf",
+						Limited_Rank : "6"
+					}
+				}, {
+					ArtistID : "15",
+					IsActiveEntity : false,
+					_ : {
+						DescendantCount : "0",
+						DistanceFromRoot : "1",
+						DrillState : "leaf",
+						Limited_Rank : "7"
+					}
+				}]
+			})
+			.expectRequest(sFriend
+				+ "?custom=foo&$apply=descendants($root/" + sFriend
+				+ ",OrgChart,_/NodeID,filter(ArtistID eq '1' and IsActiveEntity eq false),1)"
+				+ "&$select=ArtistID,IsActiveEntity,Name,_/NodeID"
+				+ "&$filter=ArtistID eq '12' and IsActiveEntity eq false"
+				+ " or ArtistID eq '13' and IsActiveEntity eq false"
+				+ "&$top=2", {
+				value : [{
+					ArtistID : "12",
+					IsActiveEntity : false,
+					Name : "New2**",
+					_ : {
+						NodeID : "12,false"
+					}
+				}]
+			})
+			.expectRequest(sFriend
+				+ "?custom=foo&$apply=descendants($root/" + sFriend
+				+ ",OrgChart,_/NodeID,filter(ArtistID eq '2' and IsActiveEntity eq false),1)"
+				+ "&$select=ArtistID,IsActiveEntity,Name,_/NodeID"
+				+ "&$filter=ArtistID eq '14' and IsActiveEntity eq false"
+				+ "&$top=1", {
+				value : [{
+					ArtistID : "14",
+					IsActiveEntity : false,
+					Name : "New4**",
+					_ : {
+						NodeID : "14,false"
+					}
+				}]
+			})
+			.expectRequest(sFriend
+				+ "?custom=foo&$apply=descendants($root/" + sFriend
+				+ ",OrgChart,_/NodeID,filter(ArtistID eq '3' and IsActiveEntity eq false),1)"
+				+ "&$select=ArtistID,IsActiveEntity,Name,_/NodeID"
+				+ "&$filter=ArtistID eq '15' and IsActiveEntity eq false"
+				+ "&$top=1", {
+				value : [{
+					ArtistID : "15",
+					IsActiveEntity : false,
+					Name : "New5**",
+					_ : {
+						NodeID : "15,false"
+					}
+				}]
+			})
+			.expectRequest(sFriend
+				+ "?custom=foo&$apply=descendants($root/" + sFriend
+				+ ",OrgChart,_/NodeID,filter(ArtistID eq '13' and IsActiveEntity eq false),1)"
+				+ "&$select=ArtistID,IsActiveEntity,Name,_/NodeID"
+				+ "&$filter=ArtistID eq '16' and IsActiveEntity eq false"
+				+ "&$top=1", {
+				value : [{
+					ArtistID : "16",
+					IsActiveEntity : false,
+					Name : "New6**",
+					_ : {
+						NodeID : "16,false"
+					}
+				}]
+			});
+
+		await Promise.all([
+			// code under test
+			oBinding.getHeaderContext().requestSideEffects([""]),
+			this.waitForChanges(assert, "(6) side-effects refresh")
+		]);
+
+		this.expectRequest(baseUrl(sExpandLevels)
+				+ "&$select=ArtistID,IsActiveEntity,Name,_/DescendantCount,_/DistanceFromRoot"
+				+ ",_/DrillState,_/NodeID"
+				+ "&$skip=4&$top=1", {
+				value : [{
+					ArtistID : "3",
+					IsActiveEntity : false,
+					Name : "Gamma**",
+					_ : {
+						DescendantCount : "3",
+						DistanceFromRoot : "0",
+						DrillState : "expanded",
+						NodeID : "3,false"
+					}
+				}]
+			})
+			.expectRequest(baseUrl(sExpandLevels)
+				+ "&$select=ArtistID,IsActiveEntity,Name,_/DescendantCount,_/DistanceFromRoot"
+				+ ",_/DrillState,_/NodeID"
+				+ "&$skip=5&$top=1", {
+				value : [{
+					ArtistID : "13",
+					IsActiveEntity : false,
+					Name : "New3**",
+					_ : {
+						DescendantCount : "1",
+						DistanceFromRoot : "1",
+						DrillState : "expanded",
+						NodeID : "13,false"
+					}
+				}]
+			})
+			.expectRequest(baseUrl(sExpandLevels)
+				+ "&$select=ArtistID,IsActiveEntity,Name,_/DescendantCount,_/DistanceFromRoot"
+				+ ",_/DrillState,_/NodeID"
+				+ "&$skip=8&$top=1", {
+				value : [{
+					ArtistID : "4",
+					IsActiveEntity : false,
+					Name : "Delta**",
+					_ : {
+						DescendantCount : "0",
+						DistanceFromRoot : "0",
+						DrillState : "leaf",
+						NodeID : "4,false"
+					}
+				}]
+			});
+
+		await this.checkAllContexts("(7) check all contexts", assert, oBinding,
+			["@$ui5.node.isExpanded", "@$ui5.node.level", "ArtistID", "Name"], [
+				[true, 1, "1", "Alpha**"],
+				[undefined, 2, "12", "New2**"],
+				[true, 2, "2", "Beta**"],
+				[undefined, 3, "14", "New4**"],
+				[true, 1, "3", "Gamma**"],
+				[undefined, 2, "15", "New5**"],
+				[true, 2, "13", "New3**"],
+				[undefined, 3, "16", "New6**"],
+				[undefined, 1, "4", "Delta**"]
+			]);
+
+		this.expectRequest(sCountUrl, 9)
+			.expectRequest(baseUrl(sExpandLevels)
+				+ "&$select=ArtistID,IsActiveEntity,Name,_/DescendantCount,_/DistanceFromRoot"
+				+ ",_/DrillState,_/NodeID"
+				+ "&$count=true&$skip=0&$top=3", {
+				"@odata.count" : "9",
+				value : [{
+					ArtistID : "1",
+					IsActiveEntity : false,
+					Name : "Alpha**",
+					_ : {
+						DescendantCount : "3",
+						DistanceFromRoot : "0",
+						DrillState : "expanded",
 						NodeID : "1,false"
 					}
 				}, {
+					ArtistID : "12",
+					IsActiveEntity : false,
+					Name : "New2**",
+					_ : {
+						DescendantCount : "0",
+						DistanceFromRoot : "1",
+						DrillState : "leaf",
+						NodeID : "12,false"
+					}
+				}, {
+					ArtistID : "2",
+					IsActiveEntity : false,
+					Name : "Beta**",
+					_ : {
+						DescendantCount : "1",
+						DistanceFromRoot : "1",
+						DrillState : "expanded",
+						NodeID : "2,false"
+					}
+				}]
+			})
+			.expectRequest(baseUrl(sExpandLevels)
+				+ "&$select=ArtistID,IsActiveEntity,_/DescendantCount,_/DistanceFromRoot"
+				+ ",_/DrillState,_/Limited_Rank"
+				+ "&$filter=ArtistID eq '1' and IsActiveEntity eq false"
+				+ " or ArtistID eq '12' and IsActiveEntity eq false"
+				+ " or ArtistID eq '14' and IsActiveEntity eq false"
+				+ " or ArtistID eq '15' and IsActiveEntity eq false"
+				+ " or ArtistID eq '2' and IsActiveEntity eq false"
+				+ " or ArtistID eq '3' and IsActiveEntity eq false"
+				+ "&$top=6", {
+				value : [{
+					ArtistID : "1",
+					IsActiveEntity : false,
+					_ : {
+						DescendantCount : "3",
+						DistanceFromRoot : "n/a", // parent's DistanceFromRoot is not yet relevant
+						DrillState : "expanded",
+						Limited_Rank : "0"
+					}
+				}, {
+					ArtistID : "12",
+					IsActiveEntity : false,
+					_ : {
+						DescendantCount : "0",
+						DistanceFromRoot : "1",
+						DrillState : "leaf",
+						Limited_Rank : "1"
+					}
+				}, {
+					ArtistID : "2",
+					IsActiveEntity : false,
+					_ : {
+						DescendantCount : "1",
+						DistanceFromRoot : "n/a", // parent's DistanceFromRoot is not yet relevant
+						DrillState : "expanded",
+						Limited_Rank : "2"
+					}
+				}, {
+					ArtistID : "14",
+					IsActiveEntity : false,
+					_ : {
+						DescendantCount : "0",
+						DistanceFromRoot : "2",
+						DrillState : "leaf",
+						Limited_Rank : "3"
+					}
+				}, {
+					ArtistID : "3",
+					IsActiveEntity : false,
+					_ : {
+						DescendantCount : "3",
+						DistanceFromRoot : "n/a", // parent's DistanceFromRoot is not yet relevant
+						DrillState : "expanded",
+						Limited_Rank : "4"
+					}
+				}, {
+					ArtistID : "15",
+					IsActiveEntity : false,
+					_ : {
+						DescendantCount : "0",
+						DistanceFromRoot : "1",
+						DrillState : "leaf",
+						Limited_Rank : "7"
+					}
+				}]
+			})
+			.expectRequest(sFriend
+				+ "?custom=foo&$apply=descendants($root/" + sFriend
+				+ ",OrgChart,_/NodeID,filter(ArtistID eq '1' and IsActiveEntity eq false),1)"
+				+ "&$select=ArtistID,IsActiveEntity,Name,_/NodeID"
+				+ "&$filter=ArtistID eq '12' and IsActiveEntity eq false"
+				+ "&$top=1", {
+				value : [{
+					ArtistID : "12",
+					IsActiveEntity : false,
+					Name : "New2**",
+					_ : {
+						NodeID : "12,false"
+					}
+				}]
+			})
+			.expectRequest(sFriend
+				+ "?custom=foo&$apply=descendants($root/" + sFriend
+				+ ",OrgChart,_/NodeID,filter(ArtistID eq '2' and IsActiveEntity eq false),1)"
+				+ "&$select=ArtistID,IsActiveEntity,Name,_/NodeID"
+				+ "&$filter=ArtistID eq '14' and IsActiveEntity eq false"
+				+ "&$top=1", {
+				value : [{
+					ArtistID : "14",
+					IsActiveEntity : false,
+					Name : "New4**",
+					_ : {
+						NodeID : "14,false"
+					}
+				}]
+			})
+			.expectRequest(sFriend
+				+ "?custom=foo&$apply=descendants($root/" + sFriend
+				+ ",OrgChart,_/NodeID,filter(ArtistID eq '3' and IsActiveEntity eq false),1)"
+				+ "&$select=ArtistID,IsActiveEntity,Name,_/NodeID"
+				+ "&$filter=ArtistID eq '15' and IsActiveEntity eq false"
+				+ "&$top=1", {
+				value : [{
+					ArtistID : "15",
+					IsActiveEntity : false,
+					Name : "New5**",
+					_ : {
+						NodeID : "15,false"
+					}
+				}]
+			});
+
+		await Promise.all([
+			// code under test
+			oBinding.getHeaderContext().requestSideEffects([""]),
+			this.waitForChanges(assert, "(8) side-effects refresh")
+		]);
+
+		this.expectRequest("DELETE Artists(ArtistID='1',IsActiveEntity=false)")
+			.expectRequest(baseUrl(sExpandLevels)
+				+ "&$select=ArtistID,IsActiveEntity,Name,_/DescendantCount,_/DistanceFromRoot"
+				+ ",_/DrillState,_/NodeID"
+				+ "&$skip=0&$top=1", {
+				value : [{
 					ArtistID : "3",
 					IsActiveEntity : false,
 					Name : "Gamma**",
+					_ : {
+						DescendantCount : "3",
+						DistanceFromRoot : "0",
+						DrillState : "expanded",
+						NodeID : "3,false"
+					}
+				}]
+			})
+			.expectRequest(baseUrl(sExpandLevels)
+				+ "&$select=ArtistID,IsActiveEntity,Name,_/DescendantCount,_/DistanceFromRoot"
+				+ ",_/DrillState,_/NodeID"
+				+ "&$skip=1&$top=1", {
+				value : [{
+					ArtistID : "13",
+					IsActiveEntity : false,
+					Name : "New3**",
+					_ : {
+						DescendantCount : "1",
+						DistanceFromRoot : "1",
+						DrillState : "expanded",
+						NodeID : "13,false"
+					}
+				}]
+			});
+
+		await Promise.all([
+			// code under test
+			oAlpha.delete(),
+			this.waitForChanges(assert, "(9) delete Alpha")
+		]);
+
+		checkTable("after (9)", assert, oTable, [
+			`/${sFriend}(ArtistID='3',IsActiveEntity=false)`,
+			`/${sFriend}(ArtistID='15',IsActiveEntity=false)`,
+			`/${sFriend}(ArtistID='13',IsActiveEntity=false)`
+		], [
+			[true, 1, "3", "Gamma**"],
+			[undefined, 2, "15", "New5**"],
+			[true, 2, "13", "New3**"]
+		], 5);
+
+		this.expectRequest(sCountUrl, 5)
+			.expectRequest(baseUrl(sExpandLevelsAfterDelete)
+				+ "&$select=ArtistID,IsActiveEntity,Name,_/DescendantCount,_/DistanceFromRoot"
+				+ ",_/DrillState,_/NodeID"
+				+ "&$count=true&$skip=0&$top=3", {
+				"@odata.count" : "5",
+				value : [{
+					ArtistID : "3",
+					IsActiveEntity : false,
+					Name : "Gamma**",
+					_ : {
+						DescendantCount : "3",
+						DistanceFromRoot : "0",
+						DrillState : "expanded",
+						NodeID : "3,false"
+					}
+				}, {
+					ArtistID : "13",
+					IsActiveEntity : false,
+					Name : "New3**",
+					_ : {
+						DescendantCount : "1",
+						DistanceFromRoot : "1",
+						DrillState : "expanded",
+						NodeID : "13,false"
+					}
+				}, {
+					ArtistID : "16",
+					IsActiveEntity : false,
+					Name : "New6**",
+					_ : {
+						DescendantCount : "0",
+						DistanceFromRoot : "2",
+						DrillState : "leaf",
+						NodeID : "16,false"
+					}
+				}]
+			})
+			.expectRequest(baseUrl(sExpandLevelsAfterDelete)
+				+ "&$select=ArtistID,IsActiveEntity,_/DescendantCount,_/DistanceFromRoot"
+				+ ",_/DrillState,_/Limited_Rank"
+				+ "&$filter=ArtistID eq '15' and IsActiveEntity eq false"
+				+ " or ArtistID eq '3' and IsActiveEntity eq false"
+				+ "&$top=2", {
+				value : [{
+					ArtistID : "3",
+					IsActiveEntity : false,
+					_ : {
+						DescendantCount : "3",
+						DistanceFromRoot : "n/a", // parent's DistanceFromRoot is not yet relevant
+						DrillState : "expanded",
+						Limited_Rank : "0"
+					}
+				}, {
+					ArtistID : "15",
+					IsActiveEntity : false,
+					_ : {
+						DescendantCount : "0",
+						DistanceFromRoot : "1",
+						DrillState : "leaf",
+						Limited_Rank : "3"
+					}
+				}]
+			})
+			.expectRequest(sFriend
+				+ "?custom=foo&$apply=descendants($root/" + sFriend
+				+ ",OrgChart,_/NodeID,filter(ArtistID eq '3' and IsActiveEntity eq false),1)"
+				+ "&$select=ArtistID,IsActiveEntity,Name,_/NodeID"
+				+ "&$filter=ArtistID eq '15' and IsActiveEntity eq false"
+				+ "&$top=1", {
+				value : [{
+					ArtistID : "15",
+					IsActiveEntity : false,
+					Name : "New5**",
+					_ : {
+						NodeID : "15,false"
+					}
+				}]
+			});
+
+		await Promise.all([
+			// code under test
+			oBinding.getHeaderContext().requestSideEffects([""]),
+			this.waitForChanges(assert, "(10) side-effects refresh")
+		]);
+
+		checkTable("after (10)", assert, oTable, [
+			`/${sFriend}(ArtistID='3',IsActiveEntity=false)`,
+			`/${sFriend}(ArtistID='15',IsActiveEntity=false)`,
+			`/${sFriend}(ArtistID='13',IsActiveEntity=false)`,
+			`/${sFriend}(ArtistID='16',IsActiveEntity=false)`
+		], [
+			[true, 1, "3", "Gamma**"],
+			[undefined, 2, "15", "New5**"],
+			[true, 2, "13", "New3**"]
+		], 5);
+
+		this.expectRequest(sCountUrl, 5)
+			.expectRequest(baseUrl()
+				+ "&$select=ArtistID,IsActiveEntity,Name,_/DrillState,_/NodeID"
+				+ "&$count=true&$skip=0&$top=3", {
+				"@odata.count" : "2",
+				value : [{
+					ArtistID : "3",
+					IsActiveEntity : false,
+					Name : "Gamma***",
 					_ : {
 						DrillState : "collapsed",
 						NodeID : "3,false"
@@ -32781,7 +33599,7 @@ make root = ${bMakeRoot}`;
 				}, {
 					ArtistID : "4",
 					IsActiveEntity : false,
-					Name : "Delta**",
+					Name : "Delta***",
 					_ : {
 						DrillState : "leaf",
 						NodeID : "4,false"
@@ -32789,30 +33607,29 @@ make root = ${bMakeRoot}`;
 				}]
 			});
 
-		oBinding.refresh();
-
-		await this.waitForChanges(assert, "(5) refresh the binding");
+		await Promise.all([
+			oBinding.requestRefresh(),
+			this.waitForChanges(assert, "(11) refresh the binding")
+		]);
 
-		checkTable("after (5)", assert, oTable, [
-			sFriend + "(ArtistID='1',IsActiveEntity=false)",
-			sFriend + "(ArtistID='3',IsActiveEntity=false)",
-			sFriend + "(ArtistID='4',IsActiveEntity=false)"
+		checkTable("after (11)", assert, oTable, [
+			`/${sFriend}(ArtistID='3',IsActiveEntity=false)`,
+			`/${sFriend}(ArtistID='4',IsActiveEntity=false)`
 		], [
-			[false, 1, "1", "Alpha**"],
-			[false, 1, "3", "Gamma**"],
-			[undefined, 1, "4", "Delta**"]
+			[false, 1, "3", "Gamma***"],
+			[undefined, 1, "4", "Delta***"]
 		]);
 	});
 
 	//*********************************************************************************************
 	// Scenario: A hierarchy has two visible rows, expandTo 2, and first visible row 2.
 	// (1) Collapse Gamma
-	// (2) Create two root nodes Zeta and Eta which the server puts at the end
+	// (2) Create root nodes Zeta and Eta which the server puts at the end; create Theta below Alpha
 	// (3) Side-effects refresh (-> unified cache; after having read the in-place data, the created
 	//     nodes are moved to the front and the in-place range is shifted)
 	// (4) Check all contexts
 	// JIRA: CPOUI5ODATAV4-2454
-	QUnit.test("Recursive Hierarchy: out of place, root nodes", async function (assert) {
+	QUnit.test("Recursive Hierarchy: out of place, root, expandTo > 1", async function (assert) {
 		const oModel = this.createTeaBusiModel({autoExpandSelect : true});
 		const sCountUrl = "EMPLOYEES/$count?$filter=AGE gt 20&custom=foo&$search=covfefe";
 		const sFilterSearchPrefix = "ancestors($root/EMPLOYEES,OrgChart,ID,filter(AGE gt 20)"
@@ -32821,8 +33638,8 @@ make root = ${bMakeRoot}`;
 			+ "?custom=foo&$apply=" + sFilterSearchPrefix + "orderby(ENTRYDATE)"
 			+ "/com.sap.vocabularies.Hierarchy.v1.TopLevels(HierarchyNodes=$root/EMPLOYEES"
 			+ ",HierarchyQualifier='OrgChart',NodeProperty='ID',Levels=2)";
-		const sUrlWithExpandLevels = sUrl.slice(0, -1)
-			+ ",ExpandLevels=" + JSON.stringify([{NodeID : "3", Levels : 0}]) + ")";
+		const sUrlWithExpandLevels = sUrl.slice(0, -1) + ",ExpandLevels="
+			+ JSON.stringify([{NodeID : "3", Levels : 0}, {NodeID : "1", Levels : 1}]) + ")";
 		const sView = `
 <t:Table id="table" firstVisibleRow="2" rows="{path : '/EMPLOYEES',
 		parameters : {
@@ -32842,6 +33659,7 @@ make root = ${bMakeRoot}`;
 </t:Table>`;
 
 		// 1 Alpha
+		//   8 Theta (created)
 		// 2 Beta
 		// 3 Gamma (first visible row)
 		//   4 Delta
@@ -32923,8 +33741,7 @@ make root = ${bMakeRoot}`;
 					Name : "Beta"
 				}]
 			})
-			.expectRequest(sUrl.replace("custom=foo&", "")
-				+ "&$filter=ID eq '6'&$select=LimitedRank",
+			.expectRequest(sUrl + "&$filter=ID eq '6'&$select=LimitedRank",
 				{value : [{LimitedRank : "5"}]});
 
 		const oZeta = oBinding.create({Name : "Zeta"}, /*bSkipRefresh*/true);
@@ -32937,8 +33754,7 @@ make root = ${bMakeRoot}`;
 		this.expectRequest(
 				{method : "POST", url : "EMPLOYEES?custom=foo", payload : {Name : "Eta"}},
 				{ID : "7", Name : "Eta"})
-			.expectRequest(sUrl.replace("custom=foo&", "")
-				+ "&$filter=ID eq '7'&$select=LimitedRank",
+			.expectRequest(sUrl + "&$filter=ID eq '7'&$select=LimitedRank",
 				{value : [{LimitedRank : "6"}]});
 
 		const oEta = oBinding.create({Name : "Eta"}, /*bSkipRefresh*/true);
@@ -32948,32 +33764,61 @@ make root = ${bMakeRoot}`;
 			this.waitForChanges(assert, "(2b) create Eta")
 		]);
 
+		this.expectRequest({
+				method : "POST",
+				url : "EMPLOYEES?custom=foo",
+				payload : {
+					"EMPLOYEE_2_MANAGER@odata.bind" : "EMPLOYEES('1')",
+					Name : "Theta"
+				}
+			}, {ID : "8", Name : "Theta"})
+			.expectRequest(sUrl + "&$filter=ID eq '8'&$select=LimitedRank",
+				{value : [{LimitedRank : "1"}]});
+
+		const oAlpha = oTable.getRows()[0].getBindingContext();
+		const oTheta = oBinding.create({
+			"@$ui5.node.parent" : oAlpha,
+			Name : "Theta"
+		}, /*bSkipRefresh*/true);
+
+		await Promise.all([
+			oTheta.created(),
+			this.waitForChanges(assert, "(2c) create Theta")
+		]);
+
 		checkTable("after (2)", assert, oTable, [
 			"/EMPLOYEES('7')",
 			"/EMPLOYEES('6')",
 			"/EMPLOYEES('1')",
+			"/EMPLOYEES('8')",
 			"/EMPLOYEES('2')",
 			"/EMPLOYEES('3')",
 			"/EMPLOYEES('5')"
 		], [
-			[undefined, 1, "Alpha"],
-			[undefined, 1, "Beta"]
+			[true, 1, "Alpha"],
+			[undefined, 2, "Theta"]
 		]);
 
-		this.expectRequest(sCountUrl, 7)
+		this.expectRequest(sCountUrl, 8)
 			.expectRequest({
-				batchNo : 7,
+				batchNo : 9,
 				url : sUrlWithExpandLevels
 					+ "&$select=DescendantCount,DistanceFromRoot,DrillState,ID,Name"
 					+ "&$count=true&$skip=0&$top=4"
 			}, {
-				"@odata.count" : "6",
+				"@odata.count" : "7",
 				value : [{
-					DescendantCount : "0",
+					DescendantCount : "1",
 					DistanceFromRoot : "0",
-					DrillState : "leaf",
+					DrillState : "expanded",
 					ID : "1",
 					Name : "Alpha*"
+				}, {
+					DescendantCount : "0",
+					DistanceFromRoot : "1",
+					DrillState : "leaf",
+					ID : "8",
+					Name : "Theta*"
 				}, {
 					DescendantCount : "0",
 					DistanceFromRoot : "0",
@@ -32986,36 +33831,43 @@ make root = ${bMakeRoot}`;
 					DrillState : "collapsed",
 					ID : "3",
 					Name : "Gamma*"
-				}, {
-					DescendantCount : "0",
-					DistanceFromRoot : "0",
-					DrillState : "leaf",
-					ID : "5",
-					Name : "Epsilon*"
 				}]
 			})
 			.expectRequest({
-				batchNo : 7,
+				batchNo : 9,
 				url : sUrlWithExpandLevels
 					+ "&$select=DescendantCount,DistanceFromRoot,DrillState,ID,LimitedRank"
-					+ "&$filter=ID eq '6' or ID eq '7'&$top=2"
+					+ "&$filter=ID eq '1' or ID eq '6' or ID eq '7' or ID eq '8'&$top=4"
 			}, {
 				value : [{
+					DescendantCount : "1",
+					DistanceFromRoot : "0",
+					DrillState : "expanded",
+					ID : "1",
+					LimitedRank : "0"
+				}, {
+					DescendantCount : "0",
+					DistanceFromRoot : "1",
+					DrillState : "leaf",
+					ID : "8",
+					LimitedRank : "1"
+				}, {
 					DescendantCount : "0",
 					DistanceFromRoot : "0",
 					DrillState : "leaf",
 					ID : "6",
-					LimitedRank : "4"
+					LimitedRank : "5"
 				}, {
 					DescendantCount : "0",
 					DistanceFromRoot : "0",
 					DrillState : "leaf",
 					ID : "7",
-					LimitedRank : "5"
+					LimitedRank : "6"
 				}]
 			})
 			.expectRequest({
-				batchNo : 7,
+				batchNo : 9,
+				// Important: this request contains no Levels=2 and no ExpandLevels
 				url : "EMPLOYEES?custom=foo&$apply=com.sap.vocabularies.Hierarchy.v1.TopLevels"
 					+ "(HierarchyNodes=$root/EMPLOYEES,HierarchyQualifier='OrgChart'"
 					+ ",NodeProperty='ID',Levels=1)"
@@ -33026,6 +33878,17 @@ make root = ${bMakeRoot}`;
 					{ID : "6", Name : "Zeta*"},
 					{ID : "7", Name : "Eta*"}
 				]
+			})
+			.expectRequest({
+				batchNo : 9,
+				// Important: this request contains no Levels=2 and no ExpandLevels
+				url : "EMPLOYEES?custom=foo&$apply=descendants($root/EMPLOYEES"
+					+ ",OrgChart,ID,filter(ID eq '1'),1)"
+					+ "&$select=ID,Name"
+					+ "&$filter=ID eq '8'"
+					+ "&$top=1"
+			}, {
+				value : [{ID : "8", Name : "Theta*"}]
 			});
 
 		await Promise.all([
@@ -33037,29 +33900,367 @@ make root = ${bMakeRoot}`;
 			"/EMPLOYEES('7')",
 			"/EMPLOYEES('6')",
 			"/EMPLOYEES('1')",
+			"/EMPLOYEES('8')",
 			"/EMPLOYEES('2')",
-			"/EMPLOYEES('3')",
-			"/EMPLOYEES('5')"
+			"/EMPLOYEES('3')"
 		], [
-			[undefined, 1, "Alpha*"],
-			[undefined, 1, "Beta*"]
-		]);
+			[true, 1, "Alpha*"],
+			[undefined, 2, "Theta*"]
+		], 7);
+
+		this.expectRequest(sUrlWithExpandLevels
+				+ "&$select=DescendantCount,DistanceFromRoot,DrillState,ID,Name"
+				+ "&$skip=4&$top=1", {
+				value : [{
+					DescendantCount : "0",
+					DistanceFromRoot : "0",
+					DrillState : "leaf",
+					ID : "5",
+					Name : "Epsilon*"
+				}]
+			});
 
 		await this.checkAllContexts("(4) check all contexts", assert, oBinding,
 			["@$ui5.node.isExpanded", "@$ui5.node.level", "Name"], [
 				[undefined, 1, "Eta*"],
 				[undefined, 1, "Zeta*"],
-				[undefined, 1, "Alpha*"],
+				[true, 1, "Alpha*"],
+				[undefined, 2, "Theta*"],
 				[undefined, 1, "Beta*"],
 				[false, 1, "Gamma*"],
 				[undefined, 1, "Epsilon*"]
 			]);
 	});
 
+	//*********************************************************************************************
+	// Scenario: A hierarchy has two visible rows and is completely expanded.
+	// (1) Create New1 below Alpha; create New2 below New1
+	// (2) Side-effects refresh (delivers new nested "bonus items" below New1)
+	// (3) Check all contexts
+	// (4) Collapse Alpha
+	// (5) Side-effects refresh
+	// (6) Expand Alpha (restores out-of-place positions)
+	// (7) Check all contexts
+	// JIRA: CPOUI5ODATAV4-2510
+	QUnit.test("Recursive Hierarchy: out of place, bonus item, collapse", async function (assert) {
+		const oModel = this.createTeaBusiModel({autoExpandSelect : true});
+		const sUrl = "EMPLOYEES"
+			+ "?$apply=com.sap.vocabularies.Hierarchy.v1.TopLevels(HierarchyNodes=$root/EMPLOYEES"
+			+ ",HierarchyQualifier='OrgChart',NodeProperty='ID')";
+		const sUrlWithExpandLevels = sUrl.slice(0, -1)
+			+ ",ExpandLevels=" + JSON.stringify([{NodeID : "11", Levels : 1}]) + ")";
+		const sUrlWithExpandLevelsCollapsed = sUrl.slice(0, -1) + ",ExpandLevels="
+			+ JSON.stringify([{NodeID : "11", Levels : 1}, {NodeID : "1", Levels : 0}]) + ")";
+		const sView = `
+<t:Table id="table" rows="{path : '/EMPLOYEES',
+		parameters : {
+			$$aggregation : {
+				expandTo : 1E16,
+				hierarchyQualifier : 'OrgChart'
+			}
+		}}" threshold="0" visibleRowCount="2">
+	<Text text="{= %{@$ui5.node.isExpanded} }"/>
+	<Text text="{= %{@$ui5.node.level} }"/>
+	<Text text="{Name}"/>
+</t:Table>`;
+
+		// 1 Alpha
+		//    2 Beta
+		//   11 New1 (created)
+		//      21 NewFromServer1 ("bonus item")
+		//         22 NewFromServer2 ("bonus item")
+		//      12 New2 (created)
+		// 3 Gamma
+		this.expectRequest(sUrl
+				+ "&$select=DescendantCount,DistanceFromRoot,DrillState,ID,Name"
+				+ "&$count=true&$skip=0&$top=2", {
+				"@odata.count" : "3",
+				value : [{
+					DescendantCount : "1",
+					DistanceFromRoot : "0",
+					DrillState : "expanded",
+					ID : "1",
+					Name : "Alpha"
+				}, {
+					DescendantCount : "0",
+					DistanceFromRoot : "1",
+					DrillState : "leaf",
+					ID : "2",
+					Name : "Beta"
+				}]
+			});
+
+		await this.createView(assert, sView, oModel);
+
+		const oTable = this.oView.byId("table");
+		const oBinding = oTable.getBinding("rows");
+		checkTable("initial page", assert, oTable, [
+			"/EMPLOYEES('1')",
+			"/EMPLOYEES('2')"
+		], [
+			[true, 1, "Alpha"],
+			[undefined, 2, "Beta"]
+		], 3);
+		const oAlpha = oBinding.getCurrentContexts()[0];
+
+		this.expectRequest({
+				method : "POST",
+				url : "EMPLOYEES",
+				payload : {
+					"EMPLOYEE_2_MANAGER@odata.bind" : "EMPLOYEES('1')",
+					Name : "New1"
+				}
+			}, {
+				ID : "11",
+				Name : "New1"
+			})
+			.expectRequest(sUrl + "&$filter=ID eq '11'&$select=LimitedRank", {
+				value : [{
+					LimitedRank : "2"
+				}]
+			});
+
+		const oNew1 = oBinding.create({
+			"@$ui5.node.parent" : oAlpha,
+			Name : "New1"
+		}, /*bSkipRefresh*/true);
+
+		await Promise.all([
+			oNew1.created(),
+			this.waitForChanges(assert, "(1) create New1")
+		]);
+
+		this.expectRequest({
+				method : "POST",
+				url : "EMPLOYEES",
+				payload : {
+					"EMPLOYEE_2_MANAGER@odata.bind" : "EMPLOYEES('11')",
+					Name : "New2"
+				}
+			}, {
+				ID : "12",
+				Name : "New2"
+			})
+			.expectRequest(sUrl + "&$filter=ID eq '12'&$select=LimitedRank", {
+				value : [{
+					LimitedRank : "3"
+				}]
+			});
+
+		const oNew2 = oBinding.create({
+			"@$ui5.node.parent" : oNew1,
+			Name : "New2"
+		}, /*bSkipRefresh*/true);
+
+		await Promise.all([
+			oNew2.created(),
+			this.waitForChanges(assert, "(1) create New2")
+		]);
+
+		checkTable("after (1)", assert, oTable, [
+			"/EMPLOYEES('1')",
+			"/EMPLOYEES('11')",
+			"/EMPLOYEES('12')",
+			"/EMPLOYEES('2')"
+		], [
+			[true, 1, "Alpha"],
+			[true, 2, "New1"]
+		], 5);
+
+		const expectSideEffectsRequests = () => {
+			this.expectRequest(sUrlWithExpandLevels
+					+ "&$select=DescendantCount,DistanceFromRoot,DrillState,ID,Name"
+					+ "&$count=true&$skip=0&$top=2", {
+					"@odata.count" : "7",
+					value : [{
+						DescendantCount : "5",
+						DistanceFromRoot : "0",
+						DrillState : "expanded",
+						ID : "1",
+						Name : "Alpha*"
+					}, {
+						DescendantCount : "0",
+						DistanceFromRoot : "1",
+						DrillState : "leaf",
+						ID : "2",
+						Name : "Beta*"
+					}]
+				})
+				.expectRequest(sUrlWithExpandLevels
+					+ "&$select=DescendantCount,DistanceFromRoot,DrillState,ID,LimitedRank"
+					+ "&$filter=ID eq '1' or ID eq '11' or ID eq '12'&$top=3", {
+					value : [{
+						DescendantCount : "5",
+						DistanceFromRoot : "0",
+						DrillState : "expanded",
+						ID : "1",
+						LimitedRank : "0"
+					}, {
+						DescendantCount : "3",
+						DistanceFromRoot : "1",
+						DrillState : "expanded",
+						ID : "11",
+						LimitedRank : "2"
+					}, {
+						DescendantCount : "0",
+						DistanceFromRoot : "2",
+						DrillState : "leaf",
+						ID : "12",
+						LimitedRank : "5"
+					}]
+				})
+				.expectRequest("EMPLOYEES"
+					+ "?$apply=descendants($root/EMPLOYEES,OrgChart,ID,filter(ID eq '1'),1)"
+					+ "&$select=ID,Name&$filter=ID eq '11'&$top=1", {
+					value : [
+						{ID : "11", Name : "New1*"}
+					]
+				})
+				.expectRequest("EMPLOYEES"
+					+ "?$apply=descendants($root/EMPLOYEES,OrgChart,ID,filter(ID eq '11'),1)"
+					+ "&$select=ID,Name&$filter=ID eq '12'&$top=1", {
+					value : [
+						{ID : "12", Name : "New2*"}
+					]
+				});
+		};
+
+		expectSideEffectsRequests();
+
+		await Promise.all([
+			// code under test
+			oBinding.getHeaderContext().requestSideEffects([""]),
+			this.waitForChanges(assert, "(2) side-effects refresh")
+		]);
+
+		const checkAllContexts = async (iStep) => {
+			this.expectRequest(sUrlWithExpandLevels
+					+ "&$select=DescendantCount,DistanceFromRoot,DrillState,ID,Name"
+					+ "&$skip=3&$top=2", {
+					value : [{
+						DescendantCount : "1",
+						DistanceFromRoot : "2",
+						DrillState : "expanded",
+						ID : "21",
+						Name : "NewFromServer1*"
+					}, {
+						DescendantCount : "0",
+						DistanceFromRoot : "3",
+						DrillState : "leaf",
+						ID : "22",
+						Name : "NewFromServer2*"
+					}]
+				})
+				.expectRequest(sUrlWithExpandLevels
+					+ "&$select=DescendantCount,DistanceFromRoot,DrillState,ID,Name"
+					+ "&$skip=6&$top=1", {
+					value : [{
+						DescendantCount : "0",
+						DistanceFromRoot : "0",
+						DrillState : "leaf",
+						ID : "3",
+						Name : "Gamma*"
+					}]
+				});
+
+			await this.checkAllContexts(`(${iStep}) check all contexts`, assert, oBinding,
+				["@$ui5.node.isExpanded", "@$ui5.node.level", "Name"], [
+					[true, 1, "Alpha*"],
+					[true, 2, "New1*"],
+					[undefined, 3, "New2*"],
+					[true, 3, "NewFromServer1*"],
+					[undefined, 4, "NewFromServer2*"],
+					[undefined, 2, "Beta*"],
+					[undefined, 1, "Gamma*"]
+				]);
+		};
+
+		await checkAllContexts(3);
+
+		oAlpha.collapse();
+
+		await this.waitForChanges(assert, "(4) collapse Alpha");
+
+		checkTable("after (4)", assert, oTable, [
+			"/EMPLOYEES('1')",
+			"/EMPLOYEES('3')"
+		], [
+			[false, 1, "Alpha*"],
+			[undefined, 1, "Gamma*"]
+		]);
+
+		this.expectRequest(sUrlWithExpandLevelsCollapsed
+				+ "&$select=DescendantCount,DistanceFromRoot,DrillState,ID,Name"
+				+ "&$count=true&$skip=0&$top=2", {
+				"@odata.count" : "2",
+				value : [{
+					DescendantCount : "0",
+					DistanceFromRoot : "0",
+					DrillState : "collapsed",
+					ID : "1",
+					Name : "Alpha*"
+				}, {
+					DescendantCount : "0",
+					DistanceFromRoot : "0",
+					DrillState : "leaf",
+					ID : "3",
+					Name : "Gamma*"
+				}]
+			})
+			.expectRequest(sUrlWithExpandLevelsCollapsed
+				+ "&$select=DescendantCount,DistanceFromRoot,DrillState,ID,LimitedRank"
+				+ "&$filter=ID eq '1' or ID eq '11' or ID eq '12'&$top=3", {
+				value : [{
+					DescendantCount : "0",
+					DistanceFromRoot : "0",
+					DrillState : "collapsed",
+					ID : "1",
+					LimitedRank : "0"
+				}]
+			})
+			.expectRequest("EMPLOYEES"
+				+ "?$apply=descendants($root/EMPLOYEES,OrgChart,ID,filter(ID eq '1'),1)"
+				+ "&$select=ID,Name&$filter=ID eq '11'&$top=1", {
+				value : [
+					{ID : "11", Name : "New1*"}
+				]
+			})
+			.expectRequest("EMPLOYEES"
+				+ "?$apply=descendants($root/EMPLOYEES,OrgChart,ID,filter(ID eq '11'),1)"
+				+ "&$select=ID,Name&$filter=ID eq '12'&$top=1", {
+				value : [
+					{ID : "12", Name : "New2*"}
+				]
+			});
+
+		await Promise.all([
+			// code under test
+			oBinding.getHeaderContext().requestSideEffects([""]),
+			this.waitForChanges(assert, "(5) side-effects refresh")
+		]);
+
+		checkTable("after (5)", assert, oTable, [
+			"/EMPLOYEES('1')",
+			"/EMPLOYEES('3')"
+		], [
+			[false, 1, "Alpha*"],
+			[undefined, 1, "Gamma*"]
+		]);
+
+		expectSideEffectsRequests();
+
+		// code under test
+		oAlpha.expand();
+
+		await this.waitForChanges(assert, "(6) expand Alpha");
+
+		await checkAllContexts(7);
+	});
+
 	//*********************************************************************************************
 	// Scenario: Expand all levels of a recursive hierarchy and move a node with descendants (not
-	// yet fully loaded) to another parent. Although it is shown as the new parent's first child on
-	// UI, it is actually inserted between older siblings on the server. Still, paging works!
+	// yet fully loaded) to another parent. It is inserted between older siblings on the server and
+	// is shown on the client "in place" (JIRA: CPOUI5ODATAV4-2466). Still, paging works!
 	// Collapse the new parent and later its root to check that their "descendants" is correct.
 	// A new root (Beth) is created with a new child (Gimel) and moved to Aleph, but their
 	// LimitedRank does not change. Then Gimel is moved to Aleph, thus Beth becomes a leaf again.
@@ -33221,8 +34422,8 @@ make root = ${bMakeRoot}`;
 		//     3.1 Theta
 		//     3.2 Iota
 		//     1 Beta (moved...)
-		//       1.1 Gamma
-		//         1.1.1 Delta (loaded later)
+		//       1.1 Gamma <-- first visible row
+		//         1.1.1 Delta (loaded soon)
 		//         1.1.2 Epsilon (loaded soon)
 		//     3.3 Kappa (loaded later)
 		//   4 Lambda (loaded later)
@@ -33251,9 +34452,19 @@ make root = ${bMakeRoot}`;
 			})
 			.expectRequest({
 				batchNo : 4,
-				url : sReadUrl + "&$skip=8&$top=1"
+				url : sReadUrl + "&$skip=7&$top=2"
 			}, {
 				value : [{
+					ArtistID : "1.1.1",
+					IsActiveEntity : false,
+					Name : "Delta",
+					_ : {
+						DescendantCount : "0",
+						DistanceFromRoot : "4",
+						DrillState : "leaf",
+						NodeID : "1.1.1,false"
+					}
+				}, {
 					ArtistID : "1.1.2",
 					IsActiveEntity : false,
 					Name : "Epsilon",
@@ -33276,15 +34487,16 @@ make root = ${bMakeRoot}`;
 		checkTable("after move", assert, oTable, [
 			sFriend + "(ArtistID='0',IsActiveEntity=false)",
 			sFriend + "(ArtistID='3',IsActiveEntity=false)",
+			sFriend + "(ArtistID='3.1',IsActiveEntity=false)",
+			sFriend + "(ArtistID='3.2',IsActiveEntity=false)",
 			sFriend + "(ArtistID='1',IsActiveEntity=false)",
 			sFriend + "(ArtistID='1.1',IsActiveEntity=false)",
-			sFriend + "(ArtistID='1.1.2',IsActiveEntity=false)",
-			sFriend + "(ArtistID='3.1',IsActiveEntity=false)",
-			sFriend + "(ArtistID='3.2',IsActiveEntity=false)"
+			sFriend + "(ArtistID='1.1.1',IsActiveEntity=false)",
+			sFriend + "(ArtistID='1.1.2',IsActiveEntity=false)"
 		], [
-			[undefined, 5, "1.1.2", "Epsilon"],
-			[undefined, 3, "3.1", "Theta"], // Note: on UI, Beta is shown as 1st child of Eta!
-			[undefined, 3, "3.2", "Iota"]
+			[true, 4, "1.1", "Gamma"],
+			[undefined, 5, "1.1.1", "Delta"],
+			[undefined, 5, "1.1.2", "Epsilon"]
 		], 12);
 
 		assert.strictEqual(oBeta.isTransient(), undefined, "unchanged");
@@ -33315,19 +34527,6 @@ make root = ${bMakeRoot}`;
 					}
 				}]
 			})
-			.expectRequest(sReadUrl + "&$skip=7&$top=1", {
-				value : [{
-					ArtistID : "1.1.1",
-					IsActiveEntity : false,
-					Name : "Delta",
-					_ : {
-						DescendantCount : "0",
-						DistanceFromRoot : "4",
-						DrillState : "leaf",
-						NodeID : "1.1.1,false"
-					}
-				}]
-			})
 			.expectRequest(sReadUrl + "&$skip=9&$top=3", {
 				value : [{
 					ArtistID : "3.3",
@@ -33367,12 +34566,12 @@ make root = ${bMakeRoot}`;
 				[true, 1, "0", "Alpha"],
 				[undefined, 2, "2", "Zeta"],
 				[true, 2, "3", "Eta"],
+				[undefined, 3, "3.1", "Theta"],
+				[undefined, 3, "3.2", "Iota"],
 				[true, 3, "1", "Beta"],
 				[true, 4, "1.1", "Gamma"],
 				[undefined, 5, "1.1.1", "Delta"],
 				[undefined, 5, "1.1.2", "Epsilon"],
-				[undefined, 3, "3.1", "Theta"], // Note: on UI, Beta is shown as 1st child of Eta!
-				[undefined, 3, "3.2", "Iota"],
 				[undefined, 3, "3.3", "Kappa"],
 				[undefined, 2, "4", "Lambda"],
 				[undefined, 1, "9", "Aleph"]
@@ -33428,11 +34627,27 @@ make root = ${bMakeRoot}`;
 				Name : "Beth",
 				_ : null // not available w/ RAP for a non-hierarchical request
 			})
-			.expectRequest(sBaseUrl + "&$filter=ArtistID eq '10' and IsActiveEntity eq false"
-				+ "&$select=_/" + sLimitedRank + ",_/NodeID", {
+			.expectRequest({
+				batchNo : 7,
+				url : sBaseUrl + "&$filter=ArtistID eq '10' and IsActiveEntity eq false"
+					+ "&$select=_/" + sLimitedRank
+			}, {
+				value : [{
+					_ : {
+						[sLimitedRank] : "12" // Edm.Int64
+					}
+				}]
+			})
+			.expectRequest({
+				batchNo : 7,
+				// no "orderby(...)" due to SNOW: DINC0087713
+				url : sFriend.slice(1) + "?$apply="
+					+ "com.sap.vocabularies.Hierarchy.v1.TopLevels(HierarchyNodes=$root" + sFriend
+					+ ",HierarchyQualifier='" + sHierarchyQualifier + "',NodeProperty='_/NodeID')"
+					+ "&$filter=ArtistID eq '10' and IsActiveEntity eq false&$select=_/NodeID"
+			}, {
 				value : [{
 					_ : {
-						[sLimitedRank] : "12", // Edm.Int64
 						NodeID : "10,false"
 					}
 				}]
@@ -33452,6 +34667,7 @@ make root = ${bMakeRoot}`;
 		]);
 
 		assert.deepEqual(oBeth.getObject("_"), {NodeID : "10,false"});
+		checkCreatedPersisted(assert, oBeth, oBethCreated);
 
 		await this.checkAllContexts("after create new root Beth", assert, oListBinding,
 			["@$ui5.node.isExpanded", "@$ui5.node.level", "ArtistID", "Name"], [
@@ -33461,7 +34677,6 @@ make root = ${bMakeRoot}`;
 			]);
 
 		const oAleph = oTable.getRows()[2].getBindingContext();
-		checkCreatedPersisted(assert, oBeth, oBethCreated);
 
 		this.expectRequest({
 				method : "POST",
@@ -33476,11 +34691,27 @@ make root = ${bMakeRoot}`;
 				Name : "Gimel",
 				_ : null // not available w/ RAP for a non-hierarchical request
 			})
-			.expectRequest(sBaseUrl + "&$filter=ArtistID eq '10.1' and IsActiveEntity eq false"
-				+ "&$select=_/" + sLimitedRank + ",_/NodeID", {
+			.expectRequest({
+				batchNo : 9,
+				url : sBaseUrl + "&$filter=ArtistID eq '10.1' and IsActiveEntity eq false"
+					+ "&$select=_/" + sLimitedRank
+			}, {
+				value : [{
+					_ : {
+						[sLimitedRank] : "13" // Edm.Int64
+					}
+				}]
+			})
+			.expectRequest({
+				batchNo : 9,
+				// no "orderby(...)" due to SNOW: DINC0087713
+				url : sFriend.slice(1) + "?$apply="
+					+ "com.sap.vocabularies.Hierarchy.v1.TopLevels(HierarchyNodes=$root" + sFriend
+					+ ",HierarchyQualifier='" + sHierarchyQualifier + "',NodeProperty='_/NodeID')"
+					+ "&$filter=ArtistID eq '10.1' and IsActiveEntity eq false&$select=_/NodeID"
+			}, {
 				value : [{
 					_ : {
-						[sLimitedRank] : "13", // Edm.Int64
 						NodeID : "10.1,false"
 					}
 				}]
@@ -33502,6 +34733,7 @@ make root = ${bMakeRoot}`;
 		]);
 
 		assert.deepEqual(oGimel.getObject("_"), {NodeID : "10.1,false"});
+		checkCreatedPersisted(assert, oGimel, oGimelCreated);
 
 		await this.checkAllContexts("after create new child Gimel", assert, oListBinding,
 			["@$ui5.node.isExpanded", "@$ui5.node.level", "ArtistID", "Name"], [
@@ -33511,8 +34743,6 @@ make root = ${bMakeRoot}`;
 				[undefined, 1, "9", "Aleph"]
 			]);
 
-		checkCreatedPersisted(assert, oGimel, oGimelCreated);
-
 		// 0 Alpha
 		//   2 Zeta
 		//   3 Eta
@@ -33556,6 +34786,9 @@ make root = ${bMakeRoot}`;
 			this.waitForChanges(assert, "move Beth to Aleph")
 		]);
 
+		checkPersisted(assert, oBeth);
+		checkCreatedPersisted(assert, oGimel, oGimelCreated);
+
 		// Note: #checkAllContexts will check #getIndex for all nodes
 		await this.checkAllContexts("after move Beth to Aleph", assert, oListBinding,
 			["@$ui5.node.isExpanded", "@$ui5.node.level", "ArtistID", "Name"], [
@@ -33565,9 +34798,6 @@ make root = ${bMakeRoot}`;
 				[undefined, 3, "10.1", "Gimel"]
 			]);
 
-		checkCreatedPersisted(assert, oBeth, oBethCreated);
-		checkCreatedPersisted(assert, oGimel, oGimelCreated);
-
 		this.expectRequest({
 				batchNo : 11,
 				headers : {
@@ -33597,20 +34827,18 @@ make root = ${bMakeRoot}`;
 			this.waitForChanges(assert, "move Gimel to Aleph")
 		]);
 
+		checkPersisted(assert, oGimel);
+
 		// Note: #checkAllContexts will check #getIndex for all nodes
 		await this.checkAllContexts("after move Gimel to Aleph", assert, oListBinding,
 			["@$ui5.node.isExpanded", "@$ui5.node.level", "ArtistID", "Name"], [
 				[false, 1, "0", "Alpha"],
 				[true, 1, "9", "Aleph"],
-				[undefined, 2, "10.1", "Gimel"],
-				[undefined, 2, "10", "Beth"] // last child has gone
+				[undefined, 2, "10", "Beth"], // last child has gone
+				[undefined, 2, "10.1", "Gimel"]
 			]);
 
-		checkCreatedPersisted(assert, oBeth, oBethCreated);
-		checkCreatedPersisted(assert, oGimel, oGimelCreated);
-
 		// 0 Alpha
-		//   10.1 Gimel (moved to here)
 		//   2 Zeta
 		//   3 Eta (still collapsed)
 		//     3.1 Theta
@@ -33620,6 +34848,7 @@ make root = ${bMakeRoot}`;
 		//         1.1.1 Delta
 		//         1.1.2 Epsilon
 		//     3.3 Kappa
+		//   10.1 Gimel (moved to here)
 		//   4 Lambda
 		// 9 Aleph
 		//   10 Beth
@@ -33640,8 +34869,8 @@ make root = ${bMakeRoot}`;
 					+ "&$select=_/" + sLimitedRank
 			}, {
 				value : [{
-					_ : { // Note: same rank on UI as on server
-						[sLimitedRank] : "1" // Edm.Int64
+					_ : {
+						[sLimitedRank] : "10" // Edm.Int64
 					}
 				}]
 			});
@@ -33656,15 +34885,16 @@ make root = ${bMakeRoot}`;
 		await this.checkAllContexts("after move Gimel to collapsed Alpha", assert, oListBinding,
 			["@$ui5.node.isExpanded", "@$ui5.node.level", "ArtistID", "Name"], [
 				[true, 1, "0", "Alpha"], // auto-expanded
-				[undefined, 2, "10.1", "Gimel"],
 				[undefined, 2, "2", "Zeta"],
 				[false, 2, "3", "Eta"], // still collapsed
+				[undefined, 2, "10.1", "Gimel"],
 				[undefined, 2, "4", "Lambda"],
 				[true, 1, "9", "Aleph"],
 				[undefined, 2, "10", "Beth"]
 			]);
 
-		oEta = oListBinding.getAllCurrentContexts()[3];
+		oEta = oListBinding.getAllCurrentContexts()[2];
+		assert.strictEqual(oEta.getProperty("Name"), "Eta", "double check that index was right");
 
 		// code under test
 		oEta.expand();
@@ -33672,22 +34902,23 @@ make root = ${bMakeRoot}`;
 		await this.checkAllContexts("after expand all again", assert, oListBinding,
 			["@$ui5.node.isExpanded", "@$ui5.node.level", "ArtistID", "Name"], [
 				[true, 1, "0", "Alpha"],
-				[undefined, 2, "10.1", "Gimel"],
 				[undefined, 2, "2", "Zeta"],
 				[true, 2, "3", "Eta"],
+				[undefined, 3, "3.1", "Theta"],
+				[undefined, 3, "3.2", "Iota"],
 				[true, 3, "1", "Beta"],
 				[true, 4, "1.1", "Gamma"],
 				[undefined, 5, "1.1.1", "Delta"],
 				[undefined, 5, "1.1.2", "Epsilon"],
-				[undefined, 3, "3.1", "Theta"],
-				[undefined, 3, "3.2", "Iota"],
 				[undefined, 3, "3.3", "Kappa"],
+				[undefined, 2, "10.1", "Gimel"],
 				[undefined, 2, "4", "Lambda"],
 				[true, 1, "9", "Aleph"],
 				[undefined, 2, "10", "Beth"]
 			]);
 
-		oBeta = oListBinding.getAllCurrentContexts()[4];
+		oBeta = oListBinding.getAllCurrentContexts()[5];
+		assert.strictEqual(oBeta.getProperty("Name"), "Beta", "double check that index was right");
 
 		if (bMakeRoot) {
 			this.expectRequest({
@@ -33727,12 +34958,12 @@ make root = ${bMakeRoot}`;
 					[undefined, 3, "1.1.1", "Delta"],
 					[undefined, 3, "1.1.2", "Epsilon"],
 					[true, 1, "0", "Alpha"],
-					[undefined, 2, "10.1", "Gimel"],
 					[undefined, 2, "2", "Zeta"],
 					[true, 2, "3", "Eta"],
 					[undefined, 3, "3.1", "Theta"],
 					[undefined, 3, "3.2", "Iota"],
 					[undefined, 3, "3.3", "Kappa"],
+					[undefined, 2, "10.1", "Gimel"],
 					[undefined, 2, "4", "Lambda"],
 					[true, 1, "9", "Aleph"],
 					[undefined, 2, "10", "Beth"]
@@ -33973,13 +35204,14 @@ make root = ${bMakeRoot}`;
 	QUnit.test("Recursive Hierarchy: #requestParent for non-adjacent children",
 			async function (assert) {
 		const oModel = this.createTeaBusiModel({autoExpandSelect : true});
-		const sUrl = "EMPLOYEES?$apply=com.sap.vocabularies.Hierarchy.v1.TopLevels("
+		const sUrl = "EMPLOYEES?custom=foo&$apply=com.sap.vocabularies.Hierarchy.v1.TopLevels("
 			+ "HierarchyNodes=$root/EMPLOYEES,HierarchyQualifier='OrgChart'"
 			+ ",NodeProperty='ID',Levels=2)";
 		const sView = `
 <t:Table id="table" rows="{path : '/EMPLOYEES',
 		parameters : {
-			$$aggregation : {expandTo : 2, hierarchyQualifier : 'OrgChart'}
+			$$aggregation : {expandTo : 2, hierarchyQualifier : 'OrgChart'},
+			custom : 'foo'
 		}}" firstVisibleRow="2" threshold="0" visibleRowCount="2">
 	<Text text="{= %{@$ui5.node.isExpanded} }"/>
 	<Text text="{= %{@$ui5.node.level} }"/>
@@ -34061,7 +35293,8 @@ make root = ${bMakeRoot}`;
 
 		this.expectRequest({
 				batchNo : 3,
-				url : "EMPLOYEES?$apply=ancestors($root/EMPLOYEES,OrgChart,ID,filter(ID eq '2'),1)"
+				url : "EMPLOYEES?custom=foo"
+					+ "&$apply=ancestors($root/EMPLOYEES,OrgChart,ID,filter(ID eq '2'),1)"
 					+ "&$select=ID,Name"
 			}, {
 				value : [{
@@ -34071,7 +35304,8 @@ make root = ${bMakeRoot}`;
 			})
 			.expectRequest({
 				batchNo : 3,
-				url : "EMPLOYEES?$apply=ancestors($root/EMPLOYEES,OrgChart,ID,filter(ID eq '5'),1)"
+				url : "EMPLOYEES?custom=foo"
+					+ "&$apply=ancestors($root/EMPLOYEES,OrgChart,ID,filter(ID eq '5'),1)"
 					+ "&$select=ID,Name"
 			}, {
 				value : [{
@@ -34113,7 +35347,8 @@ make root = ${bMakeRoot}`;
 		assert.strictEqual(oEta.getParent(), oAlpha);
 		assert.strictEqual(oDelta.getParent(), oAlpha);
 
-		this.expectRequest("EMPLOYEES?$select=ID,Name&$filter=ID eq '5' or ID eq '6'&$top=2", {
+		this.expectRequest("EMPLOYEES?custom=foo&$select=ID,Name&$filter=ID eq '5' or ID eq '6'"
+				+ "&$top=2", {
 				value : [{
 					DrillState : "leaf",
 					ID : "5",
@@ -34186,7 +35421,8 @@ make root = ${bMakeRoot}`;
 		]);
 
 		this.expectRequest({
-				url : "EMPLOYEES?$apply=ancestors($root/EMPLOYEES,OrgChart,ID,filter(ID eq '5'),1)"
+				url : "EMPLOYEES?custom=foo"
+					+ "&$apply=ancestors($root/EMPLOYEES,OrgChart,ID,filter(ID eq '5'),1)"
 					+ "&$select=ID,Name"
 			}, {
 				value : [{
@@ -36199,7 +37435,7 @@ make root = ${bMakeRoot}`;
 
 	//*********************************************************************************************
 	// Scenario: Object page bound to active entity: Call the "Edit" bound action on an active
-	// entity which responds with the inactive entity. The execute for the "Edit" operation binding
+	// entity which responds with the inactive entity. The invoke for the "Edit" operation binding
 	// resolves with the context for the inactive entity. Data for the inactive entity is displayed
 	// when setting this context on the object page. It can be edited and side effects can be
 	// requested. The controls on the object page bound to the return value context are cleared when
@@ -36214,7 +37450,7 @@ make root = ${bMakeRoot}`;
 		operation : "GetDraft",
 		method : "GET"
 	}].forEach(function (oFixture, i) {
-		QUnit.test("bound operation: execute resolves with V4 context, " + i, function (assert) {
+		QUnit.test("bound operation: invoke resolves with V4 context, " + i, function (assert) {
 			var oModel = this.createSpecialCasesModel({autoExpandSelect : true}),
 				oOperation,
 				sRequestPath = "Artists(ArtistID='42',IsActiveEntity=true)/special.cases."
@@ -36285,7 +37521,7 @@ make root = ${bMakeRoot}`;
 
 				// code under test
 				return Promise.all([
-					oOperation.execute(),
+					oOperation.invoke(),
 					that.waitForChanges(assert)
 				]);
 			}).then(function (aPromiseResults) {
@@ -36342,7 +37578,7 @@ make root = ${bMakeRoot}`;
 
 	//*********************************************************************************************
 	// Scenario: Object page bound to active entity: Call the "Edit" bound action on an active
-	// entity which responds with the inactive entity. The execute for the "Edit" operation binding
+	// entity which responds with the inactive entity. The invoke for the "Edit" operation binding
 	// resolves with the context for the inactive entity. Data for the inactive entity is displayed
 	// when setting this context on the object page. Then call the "Activate" bound action to switch
 	// back to the active entity. The actions are part of the form.
@@ -36465,7 +37701,7 @@ make root = ${bMakeRoot}`;
 
 			// code under test
 			return Promise.all([
-				oAction.execute(undefined, undefined, undefined, bReplaceWithRVC),
+				oAction.invoke(undefined, undefined, undefined, bReplaceWithRVC),
 				that.waitForChanges(assert)
 			]).then(function (aPromiseResults) {
 				var oContext = aPromiseResults[0]; // the return value context
@@ -36688,7 +37924,7 @@ make root = ${bMakeRoot}`;
 			that = this;
 
 		/*
-		 * Executes the given action (ActivationAction or EditAction) on Artist ID 42.
+		 * Invokes the given action (ActivationAction or EditAction) on Artist ID 42.
 		 * Sets the object page to its return value context and waits for the expected changes.
 		 *
 		 * @param {string} sAction - The name of the action
@@ -36720,7 +37956,7 @@ make root = ${bMakeRoot}`;
 
 			return Promise.all([
 				// code under test
-				oAction.execute(),
+				oAction.invoke(),
 				that.waitForChanges(assert)
 			]).then(function (aPromiseResults) {
 				oReturnValueContext = aPromiseResults[0];
@@ -36941,7 +38177,7 @@ make root = ${bMakeRoot}`;
 					Messages : []
 				});
 
-			return oOperationBinding.execute();
+			return oOperationBinding.invoke();
 		}).then(function (oReturnValueContext0) {
 			// 2. Bind object page to the return value context of the create action
 			oReturnValueContext = oReturnValueContext0;
@@ -37045,7 +38281,7 @@ make root = ${bMakeRoot}`;
 
 			return Promise.all([
 				// code under test
-				oAction.execute(),
+				oAction.invoke(),
 				that.waitForChanges(assert)
 			]);
 		}).then(function (aPromiseResults) {
@@ -37203,7 +38439,7 @@ make root = ${bMakeRoot}`;
 
 	//*********************************************************************************************
 	// Scenario: Object page bound to an active entity and its navigation property is $expand'ed via
-	// an own request. Trigger "Edit" bound action to start editing using a return value context and
+	// an own request. Invoke "Edit" bound action to start editing using a return value context and
 	// modify a property in the entity referenced by the navigation property. Activate the inactive
 	// entity via a bound action using another return value context.
 	// The elements referenced via the navigation property must not be taken from the cache.
@@ -37279,7 +38515,7 @@ make root = ${bMakeRoot}`;
 
 			return Promise.all([
 				// code under test
-				oOperation.execute(),
+				oOperation.invoke(),
 				that.waitForChanges(assert)
 			]);
 		}).then(function (aPromiseResults) {
@@ -37346,7 +38582,7 @@ make root = ${bMakeRoot}`;
 
 			return Promise.all([
 				// code under test
-				oOperation.execute(),
+				oOperation.invoke(),
 				that.waitForChanges(assert)
 			]);
 		}).then(function (aPromiseResults) {
@@ -37486,7 +38722,7 @@ make root = ${bMakeRoot}`;
 	//*********************************************************************************************
 	// Scenario: Object page bound to active entity with a navigation property $expand'ed via
 	// auto-$expand/$select. The "Edit" bound action on the active entity has the binding parameter
-	// $$inheritExpandSelect set so that it triggers the POST request with the same $expand and
+	// $$inheritExpandSelect set so that it invokes the POST request with the same $expand and
 	// $select parameters used for loading the active entity. This way, all fields in the object
 	// page can be populated from the bound action response.
 	// Read side effects which include navigation properties while there are pending changes.
@@ -37570,7 +38806,7 @@ make root = ${bMakeRoot}`;
 
 			return Promise.all([
 				// code under test
-				oOperation.execute(),
+				oOperation.invoke(),
 				that.waitForChanges(assert)
 			]);
 		}).then(function (aPromiseResults) {
@@ -37665,7 +38901,7 @@ make root = ${bMakeRoot}`;
 				// no change in messages
 
 			return Promise.all([
-				oOperation.execute(),
+				oOperation.invoke(),
 				that.waitForChanges(assert)
 			]);
 		});
@@ -37732,7 +38968,7 @@ make root = ${bMakeRoot}`;
 
 			return Promise.all([
 				// code under test
-				oOperation.execute(undefined, false, null, /*bReplaceWithRVC*/true),
+				oOperation.invoke(undefined, false, null, /*bReplaceWithRVC*/true),
 				that.waitForChanges(assert)
 			]);
 		}).then(function (aResults) {
@@ -37807,14 +39043,14 @@ make root = ${bMakeRoot}`;
 
 			return Promise.all([
 				// code under test
-				oOperation.execute(),
+				oOperation.invoke(),
 				that.waitForChanges(assert)
 			]);
 		});
 	});
 
 	//*********************************************************************************************
-	// Scenario: Delete return value context obtained from bound action execute.
+	// Scenario: Delete return value context obtained from bound action invoke.
 	// JIRA: CPOUI5UISERVICESV3-1193
 	QUnit.test("bound operation: delete return value context", function (assert) {
 		var oModel = this.createSpecialCasesModel({autoExpandSelect : true}),
@@ -37860,7 +39096,7 @@ make root = ${bMakeRoot}`;
 			return Promise.all([
 				that.oModel
 					.bindContext("special.cases.EditAction(...)", that.oView.getBindingContext())
-					.execute(),
+					.invoke(),
 				that.waitForChanges(assert)
 			]);
 		}).then(function (aPromiseResults) {
@@ -37886,9 +39122,9 @@ make root = ${bMakeRoot}`;
 	});
 
 	//*********************************************************************************************
-	// Scenario: Execute bound action with context for which no data has been read yet.
+	// Scenario: Invoke bound action with context for which no data has been read yet.
 	// CPOUI5ODATAV4-1580: show usage of ODataModel#request+getKeyPredicate
-	QUnit.test("bound operation: execute bound action on context w/o read", function (assert) {
+	QUnit.test("bound operation: invoke bound action on context w/o read", function (assert) {
 		var oEntity = {IsActiveEntity : true, ArtistID : "4/2"}, // reverse key odering
 			oModel = this.createSpecialCasesModel({autoExpandSelect : true}),
 			oParentContext,
@@ -37911,7 +39147,7 @@ make root = ${bMakeRoot}`;
 
 			return Promise.all([
 				// code under test
-				oModel.bindContext("special.cases.EditAction(...)", oParentContext).execute(),
+				oModel.bindContext("special.cases.EditAction(...)", oParentContext).invoke(),
 				that.waitForChanges(assert)
 			]);
 		}).then(function (aPromiseResults) {
@@ -37945,7 +39181,7 @@ make root = ${bMakeRoot}`;
 	// JIRA: CPOUI5ODATAV4-1271
 	//
 	// - An invalid value is entered. Editing is canceled, but the active version is unknown and
-	// first needs to be retrieved via execution of "SiblingEntity(...)" navigation propery. The
+	// first needs to be retrieved via invocation of "SiblingEntity(...)" navigation propery. The
 	// draft is DELETEd afterwards.
 	// JIRA: CPOUI5ODATAV4-1272
 ["EditAction", "GetDraft"].forEach(function (sDraftOperation) {
@@ -38073,7 +39309,7 @@ make root = ${bMakeRoot}`;
 
 			return Promise.all([
 				// code under test
-				oDraftOperation.execute(/*sGroupId*/undefined, /*bIgnoreETag*/false,
+				oDraftOperation.invoke(/*sGroupId*/undefined, /*bIgnoreETag*/false,
 					/*fnOnStrictHandlingFailed*/null, /*bReplaceWithRVC*/true),
 				that.waitForChanges(assert, sDraftOperation)
 			]);
@@ -38155,7 +39391,7 @@ make root = ${bMakeRoot}`;
 					// code under test
 					oInactiveArtistContext.setProperty("Name", "Mrs Eliot"),
 					// code under test
-					oActivationAction.execute(/*sGroupId*/undefined, /*bIgnoreETag*/false,
+					oActivationAction.invoke(/*sGroupId*/undefined, /*bIgnoreETag*/false,
 						/*fnOnStrictHandlingFailed*/null, /*bReplaceWithRVC*/true),
 					that.waitForChanges(assert, "PATCH Name & POST ActivationAction")
 				]).then(function (aResults) {
@@ -38306,7 +39542,7 @@ make root = ${bMakeRoot}`;
 
 				return Promise.all([
 					// code under test
-					oSiblingEntity.execute("$auto", /*bIgnoreETag*/false,
+					oSiblingEntity.invoke("$auto", /*bIgnoreETag*/false,
 						/*fnOnStrictHandlingFailed*/null, /*bReplaceWithRVC*/true),
 					that.waitForChanges(assert, "SiblingEntity")
 				]);
@@ -38361,7 +39597,7 @@ make root = ${bMakeRoot}`;
 });
 
 	//*********************************************************************************************
-	// Scenario: Execute bound action; the parent binding has an empty path, but does not have a
+	// Scenario: Invoke bound action; the parent binding has an empty path, but does not have a
 	// cache, so that $$inheritExpandSelect must search the query options in the parent's parent.
 	// JIRA: CPOUI5ODATAV4-189
 	QUnit.test("bound operation: $$inheritExpandSelect and parent w/o cache #1", function (assert) {
@@ -38401,7 +39637,7 @@ make root = ${bMakeRoot}`;
 				});
 
 			return Promise.all([
-				that.oView.byId("action").getObjectBinding().execute(),
+				that.oView.byId("action").getObjectBinding().invoke(),
 				that.waitForChanges(assert)
 			]);
 		}).then(function (aResults) {
@@ -38410,7 +39646,7 @@ make root = ${bMakeRoot}`;
 	});
 
 	//*********************************************************************************************
-	// Scenario: Execute bound action; the parent binding has a non-empty path, but does not have a
+	// Scenario: Invoke bound action; the parent binding has a non-empty path, but does not have a
 	// cache, so that $$inheritExpandSelect must search the query options in the parent's parent.
 	// JIRA: CPOUI5ODATAV4-189
 	QUnit.test("bound operation: $$inheritExpandSelect and parent w/o cache #2", function (assert) {
@@ -38479,7 +39715,7 @@ make root = ${bMakeRoot}`;
 				}]);
 
 			return Promise.all([
-				that.oView.byId("action").getObjectBinding().execute(),
+				that.oView.byId("action").getObjectBinding().invoke(),
 				that.waitForChanges(assert)
 			]);
 		}).then(function ([oReturnValueContext]) {
@@ -38539,7 +39775,7 @@ make root = ${bMakeRoot}`;
 
 			return Promise.all([
 				// code under test
-				oAction.execute(),
+				oAction.invoke(),
 				that.waitForChanges(assert)
 			]);
 		});
@@ -38608,7 +39844,7 @@ make root = ${bMakeRoot}`;
 
 			return Promise.all([
 				// code under test
-				oAction.execute().then(function (oReturnValueContext) {
+				oAction.invoke().then(function (oReturnValueContext) {
 					assert.strictEqual(
 						oReturnValueContext.getPath(),
 						"/TEAMS('02')/TEAM_2_EMPLOYEES('7')");
@@ -38711,7 +39947,7 @@ make root = ${bMakeRoot}`;
 
 			return Promise.all([
 				// code under test
-				oAction.execute(),
+				oAction.invoke(),
 				that.waitForChanges(assert)
 			]);
 		}).then(function () {
@@ -38726,7 +39962,7 @@ make root = ${bMakeRoot}`;
 
 			return Promise.all([
 				// code under test
-				oFunction.execute(),
+				oFunction.invoke(),
 				that.waitForChanges(assert)
 			]);
 		});
@@ -38910,7 +40146,7 @@ make root = ${bMakeRoot}`;
 	//*********************************************************************************************
 	// Scenario:
 	// Two List/Detail binding hierarchies for sales orders and sales order line items. When
-	// refreshing a single sales order, line items requests are triggered and messages are updated
+	// refreshing a single sales order, line items requests are invoked and messages are updated
 	// only for this single sales order and its dependent sales order line items. For other sales
 	// orders and their dependent sales order line items cached data is not discarded and messages
 	// are kept untouched. If there are unresolved bindings, their cached data which depends on the
@@ -39134,7 +40370,7 @@ make root = ${bMakeRoot}`;
 				"None", "");
 		}).then(function () {
 			// select the first sales order to get its items and messages, request is
-			// triggered because the cache for the sales order line items is discarded
+			// invoked because the cache for the sales order line items is discarded
 			that.expectRequest("SalesOrderList('0500000347')/SO_2_SOITEM"
 					+ "?$select=ItemPosition,Messages,Note,SalesOrderID&$skip=0&$top=100", {
 					value : [{
@@ -39830,7 +41066,7 @@ make root = ${bMakeRoot}`;
 						}]
 					}
 				})
-				.expectChange("name", "") // triggered by setValue
+				.expectChange("name", "") // invoked by setValue
 				.expectMessages([{
 					code : "1",
 					message : "Enter a name",
@@ -39857,7 +41093,7 @@ make root = ${bMakeRoot}`;
 					Name : "Hugo",
 					__CT__FAKE__Message : {__FAKE__Messages : []}
 				})
-				.expectChange("name", "Hugo") // triggered by setValue
+				.expectChange("name", "Hugo") // invoked by setValue
 				.expectMessages([]);
 
 			// code under test
@@ -39934,7 +41170,7 @@ make root = ${bMakeRoot}`;
 						}]
 					}
 				})
-				.expectChange("name", [""]) // triggered by setValue
+				.expectChange("name", [""]) // invoked by setValue
 				.expectMessages([{
 					code : "1",
 					message : "Enter a name",
@@ -40014,7 +41250,7 @@ make root = ${bMakeRoot}`;
 						}]
 					}
 				})
-				.expectChange("name", [""]) // triggered by setValue
+				.expectChange("name", [""]) // invoked by setValue
 				.expectMessages([{
 					code : "1",
 					message : "Enter a name",
@@ -40621,7 +41857,7 @@ make root = ${bMakeRoot}`;
 
 	//*********************************************************************************************
 	// Scenario: Modifying a property of a kept-alive element in a list with
-	// $$patchWithoutSideEffects, triggers a side-effects refresh. The PATCH request does change the
+	// $$patchWithoutSideEffects, invokes a side-effects refresh. The PATCH request does change the
 	// ETag of the kept-alive element. The list refresh request does only add unknown properties
 	// to the kept-alive element, but does not take over changed properties. The refresh for the
 	// kept-alive element must do this.
@@ -42004,8 +43240,8 @@ make root = ${bMakeRoot}`;
 				}]);
 
 			return Promise.all([
-				oOperationBinding.execute(),
-				that.waitForChanges(assert, "execute")
+				oOperationBinding.invoke(),
+				that.waitForChanges(assert, "invoke")
 			]);
 		}).then(function (aResults) {
 			oReturnValueContext = aResults[0];
@@ -42179,7 +43415,7 @@ make root = ${bMakeRoot}`;
 	});
 
 	//*********************************************************************************************
-	// Scenario: A requestSideEffects and a bound action are triggered concurrently and end up in
+	// Scenario: A requestSideEffects and a bound action are invoked concurrently and end up in
 	// the same $batch. The requestSideEffects is already running when the action starts.
 	// Nevertheless it must be possible to get the action's binding parameter from the cache being
 	// updated.
@@ -42228,8 +43464,8 @@ make root = ${bMakeRoot}`;
 			return Promise.all([
 				that.oView.byId("form").getBindingContext().requestSideEffects(["SO_2_SOITEM"]),
 				Promise.resolve().then(function () {
-					// code under test - execute while requestSideEffects is already being processed
-					return that.oView.byId("action").getObjectBinding().execute()
+					// code under test - invoke while requestSideEffects is already being processed
+					return that.oView.byId("action").getObjectBinding().invoke()
 						.then(function (oReturnValueContext) {
 							assert.strictEqual(oReturnValueContext, undefined,
 								"no R.V.C. w/o key predicate");
@@ -42273,7 +43509,7 @@ make root = ${bMakeRoot}`;
 			}, {/* don't care */});
 
 		oRoomIdBinding.setValue("32");
-	}, function (assert) { // ODCB#execute restarts only PATCHes for the same entity
+	}, function (assert) { // ODCB#invoke restarts only PATCHes for the same entity
 		var sAction = "com.sap.gateway.default.iwbep.tea_busi.v0001.AcChangeTeamOfEmployee",
 			oRoomIdBinding = this.oView.byId("roomId0").getBinding("value");
 
@@ -42292,10 +43528,10 @@ make root = ${bMakeRoot}`;
 				payload : {TeamID : "23"}
 			}, {/* don't care */});
 
-		// bound action also triggers retry
+		// bound action also invokes retry
 		return this.oModel.bindContext(sAction + "(...)", oRoomIdBinding.getContext())
 			.setParameter("TeamID", "23")
-			.execute("$auto")
+			.invoke("$auto")
 			.then(function (oReturnValueContext) {
 				assert.strictEqual(oReturnValueContext, undefined,
 					"no R.V.C. w/o key predicate");
@@ -42364,7 +43600,7 @@ make root = ${bMakeRoot}`;
 			this.oModel.bindContext("/ChangeTeamBudgetByID(...)")
 				.setParameter("Budget", "1234.1234")
 				.setParameter("TeamID", "TEAM_01")
-				.execute("$auto")
+				.invoke("$auto")
 		]).then(function () {
 			return /*bAll*/true;
 		});
@@ -42649,9 +43885,9 @@ make root = ${bMakeRoot}`;
 	});
 
 	//*********************************************************************************************
-	// Scenario: ODCB#execute waits until PATCHes are back and happens inside same $batch as retry
+	// Scenario: ODCB#invoke waits until PATCHes are back and happens inside same $batch as retry
 	// (CPOUI5UISERVICESV3-1451)
-	QUnit.test("CPOUI5UISERVICESV3-1451: ODCB#execute after all PATCHes", function (assert) {
+	QUnit.test("CPOUI5UISERVICESV3-1451: ODCB#invoke after all PATCHes", function (assert) {
 		var oModel = this.createTeaBusiModel({groupId : "$direct", updateGroupId : "$auto"}),
 			fnReject,
 			oRoomIdBinding,
@@ -42730,10 +43966,10 @@ make root = ${bMakeRoot}`;
 					payload : {TeamID : "23"}
 				}, {/* don't care */});
 
-			// bound action waits for PATCHes and triggers retry
+			// bound action waits for PATCHes and invokes retry
 			oPromise = that.oModel.bindContext(sAction + "(...)", oRoomIdBinding.getContext())
 				.setParameter("TeamID", "23")
-				.execute("$auto");
+				.invoke("$auto");
 
 			return Promise.all([
 				oPromise.then(function (oReturnValueContext) {
@@ -42855,6 +44091,7 @@ make root = ${bMakeRoot}`;
 	// Delete and Patch still use the canonical path. Messages have to be reported with the deep
 	// path.
 	// CPOUI5UISERVICESV3-1813
+	// No "sap-cancel-on-close" header in DELETE request (JIRA: CPOUI5ODATAV4-2506)
 	[false, true].forEach(function (bUseCanonicalPath) {
 		QUnit.test("read with deep path, $$canonicalPath: " + bUseCanonicalPath, function (assert) {
 			var sEntityPath = bUseCanonicalPath
@@ -42967,7 +44204,7 @@ make root = ${bMakeRoot}`;
 				that.expectRequest({
 						method : "DELETE",
 						url : "ProductList('1')",
-						headers : {"If-Match" : "ETag"}
+						headers : {"If-Match" : "ETag"/*, NO "sap-cancel-on-close" */}
 					}, oError)
 					.expectMessages([{
 						code : "top_delete",
@@ -43742,11 +44979,11 @@ make root = ${bMakeRoot}`;
 		});
 	});
 	//TODO With updateGroupId $direct, changing *both* parts of a composite binding (amount and
-	//  currency) in one step triggers *two* PATCH requests:
+	//  currency) in one step invokes *two* PATCH requests:
 	//  The first request contains the new amount and also the old currency as PATCHes for amounts
 	//  are always sent with currency.
 	//  The second request only contains the new currency.
-	//  Solution idea: Only execute $direct requests in prerendering task
+	//  Solution idea: Only invoke $direct requests in prerendering task
 	//  Is this critical? - Productive scenario runs with $batch. However: What if amount and
 	//  currency are in two different fields in draft scenario (no save button)?
 
@@ -43861,7 +45098,7 @@ make root = ${bMakeRoot}`;
 	});
 
 	//*********************************************************************************************
-	// Scenario: Execute a bound action on the target of a navigation property. That action returns
+	// Scenario: Invoke a bound action on the target of a navigation property. That action returns
 	// its binding parameter which is thus updated ("cache synchronization") and is the target of
 	// messages.
 	// CPOUI5UISERVICESV3-1587
@@ -43918,7 +45155,7 @@ make root = ${bMakeRoot}`;
 
 			// code under test
 			return Promise.all([
-				oOperation.execute(),
+				oOperation.invoke(),
 				that.waitForChanges(assert)
 			]);
 		}).then(function () {
@@ -43960,7 +45197,7 @@ make root = ${bMakeRoot}`;
 				IsActiveEntity : false
 			});
 
-			return oOperationBinding.execute();
+			return oOperationBinding.invoke();
 		}).then(function (oReturnValueContext0) {
 			oReturnValueContext = oReturnValueContext0;
 
@@ -43983,7 +45220,7 @@ make root = ${bMakeRoot}`;
 				.expectChange("name", "Hour Frustrated");
 
 			return Promise.all([
-				// Note: do not use oReturnValueContext, it would trigger duplicate requests
+				// Note: do not use oReturnValueContext, it would invoke duplicate requests
 				that.oView.byId("objectPage").getObjectBinding().getBoundContext()
 					// code under test
 					.requestSideEffects([{$PropertyPath : "Name"}]),
@@ -44125,7 +45362,7 @@ make root = ${bMakeRoot}`;
 });
 
 	//*********************************************************************************************
-	// Scenario: GET request is triggered before POST, but ends up inside same $batch and thus
+	// Scenario: GET request is invoked before POST, but ends up inside same $batch and thus
 	// could return the newly created entity.
 	// JIRA: CPOUI5UISERVICESV3-1825
 	//
@@ -44177,7 +45414,7 @@ make root = ${bMakeRoot}`;
 					"@odata.count" : "3",
 					value : [{BusinessPartnerID : "4713"}]
 				});
-			// show more items before POST is even triggered
+			// show more items before POST is even invoked
 			that.oView.byId("table").requestItems();
 
 			that.expectChange("count", "4")
@@ -45078,7 +46315,7 @@ make root = ${bMakeRoot}`;
 				}]);
 
 			return Promise.all([
-				oOperationBinding.execute(),
+				oOperationBinding.invoke(),
 				that.waitForChanges(assert)
 			]);
 		}).then(function (aResult) {
@@ -45106,7 +46343,7 @@ make root = ${bMakeRoot}`;
 	});
 
 	//*********************************************************************************************
-	// Scenario: Execute a bound action, this returns a return value context although the path
+	// Scenario: Invoke a bound action, this returns a return value context although the path
 	// contains navigation properties.
 	// JIRA: CPOUI5ODATAV4-2096
 [false, true].forEach(function (bInheritExpandSelect) {
@@ -45191,7 +46428,7 @@ make root = ${bMakeRoot}`;
 		const [oReturnValueContext] = await Promise.all([
 			oActionBinding
 				.setParameter("TeamID", sTeamId)
-				.execute(),
+				.invoke(),
 			this.waitForChanges(assert)
 		]);
 
@@ -45702,7 +46939,7 @@ make root = ${bMakeRoot}`;
 
 			oForm.setBindingContext(
 				that.oView.byId("table").getItems()[0].getBindingContext());
-			oForm.getElementBinding().execute();
+			oForm.getElementBinding().invoke();
 
 			return that.waitForChanges(assert);
 		});
@@ -46237,7 +47474,7 @@ make root = ${bMakeRoot}`;
 					type : "Error"
 				}]);
 
-			// trigger error to see that hasPendingChanges finds also parked changes
+			// invoke error to see that hasPendingChanges finds also parked changes
 			that.oView.byId("soCurrencyCode").getBinding("value").setValue("invalid");
 
 			assert.ok(oModel.hasPendingChanges());
@@ -46440,7 +47677,7 @@ make root = ${bMakeRoot}`;
 			.expectChange("id", ["44", "43"])
 			// Context#getIndex returns a negative number because the ODLB has been reset and thus
 			// this.iCreatedContexts = 0;
-			// #create triggers Context#refreshDependentBindings before #rsE triggers
+			// #create invokes Context#refreshDependentBindings before #rsE invokes
 			// ODPaB#refreshDependentListBindingsWithoutCache, which seems natural (1st response is
 			// processed 1st). Not sure how JIRA: CPOUI5ODATAV4-288 could help here.
 			.expectChange("note", "Side", -1)
@@ -46705,7 +47942,7 @@ make root = ${bMakeRoot}`;
 				that.waitForChanges(assert, "repeat POST but fail again")
 			]);
 		}).then(function () {
-			oNewContext.setProperty("Note", "Updated", null); // do not trigger POST again
+			oNewContext.setProperty("Note", "Updated", null); // do not invoke POST again
 			assert.strictEqual(oNewContext.getProperty("Note"), "Updated");
 
 			that.expectChange("id", ["", "0500000001"])
@@ -46814,7 +48051,7 @@ make root = ${bMakeRoot}`;
 				})
 				.expectChange("id", ["43"]);
 
-			// invocation here shall trigger all requests
+			// invocation here shall invoke all requests
 			fnRespond();
 
 			return Promise.all([
@@ -46900,7 +48137,7 @@ make root = ${bMakeRoot}`;
 					CompanyName : "SAP SE"
 				});
 
-			// invocation here shall trigger all requests
+			// invocation here shall invoke all requests
 			fnRespond();
 
 			return Promise.all([
@@ -46922,7 +48159,7 @@ make root = ${bMakeRoot}`;
 	// For a context of a list binding, both a refresh of the whole collection and changes to
 	// structural properties only ({"$PropertyPath":"*"}) are requested at the same time. Also, both
 	// a refresh of the whole collection and of a single item ({$NavigationPropertyPath : ""}) are
-	// requested at the same time. No duplicate requests are triggered, no errors happen.
+	// requested at the same time. No duplicate requests are invoked, no errors happen.
 	// BCP: 2070206648
 	QUnit.test("requestSideEffects: path reduction", function (assert) {
 		var oContext,
@@ -47022,7 +48259,7 @@ make root = ${bMakeRoot}`;
 			return Promise.all([
 				// code under test
 				oContext.requestSideEffects([
-					{$NavigationPropertyPath : ""}, // should not trigger a duplicate request
+					{$NavigationPropertyPath : ""}, // should not invoke a duplicate request
 					{$NavigationPropertyPath : "SOITEM_2_SO/SO_2_SOITEM"}
 				]),
 				that.waitForChanges(assert)
@@ -47169,7 +48406,7 @@ make root = ${bMakeRoot}`;
 	});
 
 	//*********************************************************************************************
-	// Scenario: Refresh a context binding w/o property bindings triggering a request. Ensure that
+	// Scenario: Refresh a context binding w/o property bindings invoking a request. Ensure that
 	// dependent bindings refresh and that the promise resolves.
 	// JIRA: CPOUI5ODATAV4-293
 	QUnit.test("ODCB: requestRefresh w/o own request", function (assert) {
@@ -47742,7 +48979,7 @@ make root = ${bMakeRoot}`;
 
 	//*********************************************************************************************
 	// Scenario: Server-driven paging with sap.m.Table
-	// We expect a "growing" table to only load data when triggered by the end-user via the "More"
+	// We expect a "growing" table to only load data when invoked by the end-user via the "More"
 	// button: There are no repeated requests in case the server-side page size is 2 and thus
 	// smaller than the table's growing threshold and just the first page is displayed with less
 	// data. The next request is only sent when the end user wants to see "More".
@@ -48248,7 +49485,7 @@ make root = ${bMakeRoot}`;
 	});
 
 	//*********************************************************************************************
-	// Scenario: A PATCH (not shown here) triggers a side effect for the whole object page, while
+	// Scenario: A PATCH (not shown here) invokes a side effect for the whole object page, while
 	// a paginator switches to another item. The side effect's GET is thus ignored because the
 	// cache for the old item is already inactive; thus the promise fails. Due to this failure, the
 	// old cache was restored, which was wrong. Timing is essential!
@@ -48303,7 +49540,7 @@ make root = ${bMakeRoot}`;
 				.expectChange("name", "Team #2");
 
 			setTimeout(function () {
-				// pagination triggered by separate event --> new task
+				// pagination invoked by separate event --> new task
 				that.oView.setBindingContext(
 					oModel.bindContext("/TEAMS('TEAM_02')").getBoundContext());
 				setTimeout(fnRespond, 0);
@@ -48328,7 +49565,7 @@ make root = ${bMakeRoot}`;
 	});
 
 	//*********************************************************************************************
-	// Scenario: A PATCH (not shown here) triggers a side effect for the whole list, while a
+	// Scenario: A PATCH (not shown here) invokes a side effect for the whole list, while a
 	// paginator switches to another item. The side effect's GET is thus ignored because the cache
 	// for the old item is already inactive; thus an internal promise fails. Due to this failure,
 	// the old cache was restored, which was wrong. Timing is essential!
@@ -48392,7 +49629,7 @@ make root = ${bMakeRoot}`;
 				.expectChange("name", ["Frederic Fall"]);
 
 			setTimeout(function () {
-				// pagination triggered by separate event --> new task
+				// pagination invoked by separate event --> new task
 				oTable.setBindingContext(oModel.bindContext("/TEAMS('TEAM_02')").getBoundContext());
 				setTimeout(fnRespond, 0);
 			}, 0);
@@ -49000,7 +50237,7 @@ make root = ${bMakeRoot}`;
 	});
 
 	//*********************************************************************************************
-	// Scenario: A bound action is executed, accompanied by a side effect. The action returns a
+	// Scenario: A bound action is invoked, accompanied by a side effect. The action returns a
 	// wrong response, but the side effect must win anyway!
 	// BCP: 2070200175
 	// JIRA: CPOUI5ODATAV4-288
@@ -49038,7 +50275,7 @@ make root = ${bMakeRoot}`;
 				.expectChange("status", "C");
 
 			return Promise.all([
-				that.oView.byId("action").getObjectBinding().execute(),
+				that.oView.byId("action").getObjectBinding().invoke(),
 				that.oView.byId("form").getBindingContext().requestSideEffects(["LifecycleStatus"]),
 				that.waitForChanges(assert)
 			]);
@@ -49047,13 +50284,13 @@ make root = ${bMakeRoot}`;
 
 	//*********************************************************************************************
 	// Scenario: "Prefer:handling=strict"
-	// Execute an action with an fnOnStrictHandlingFailed callback given in order to have the
+	// Invoke an action with an fnOnStrictHandlingFailed callback given in order to have the
 	// "Prefer:handling=strict" HTTP header set. bConfirm controls how the callback is resolved.
 	//
 	// JIRA: CPOUI5ODATAV4-943
 	// BCP: 2280172148 more than one action in change set + check that the right callback is called
 	//
-	// Execute three actions in a changeset, each with a fnOnStrictHandlingFailed handler. The batch
+	// Invoke three actions in a changeset, each with a fnOnStrictHandlingFailed handler. The batch
 	// fails due to strict-handling and the response contains error messages for the first and
 	// second request or only for the first. No error message for the third request. See that each
 	// handler is called with the correct (or none) errors.
@@ -49207,11 +50444,11 @@ make root = ${bMakeRoot}`;
 
 			// code under test
 			oAction0Promise = that.oModel.bindContext(sAction + "(...)", aContexts[0])
-				.execute("$auto", false, onStrictHandlingFailed0);
+				.invoke("$auto", false, onStrictHandlingFailed0);
 			oAction1Promise = that.oModel.bindContext(sAction + "(...)", aContexts[1])
-				.execute("$auto", false, onStrictHandlingFailed1);
+				.invoke("$auto", false, onStrictHandlingFailed1);
 			oAction2Promise = that.oModel.bindContext(sAction + "(...)", aContexts[2])
-				.execute("$auto", false, onStrictHandlingFailed2);
+				.invoke("$auto", false, onStrictHandlingFailed2);
 
 			return that.waitForChanges(assert);
 		}).then(function () {
@@ -49248,11 +50485,11 @@ make root = ${bMakeRoot}`;
 					})
 					.expectChange("status", ["C0", "C1", "C2"]);
 			} else {
-				that.expectCanceledError("Failed to execute /SalesOrderList('0')/" + sAction
+				that.expectCanceledError("Failed to invoke /SalesOrderList('0')/" + sAction
 						+ "(...)", "Action canceled due to strict handling");
-				that.expectCanceledError("Failed to execute /SalesOrderList('1')/" + sAction
+				that.expectCanceledError("Failed to invoke /SalesOrderList('1')/" + sAction
 						+ "(...)", "Action canceled due to strict handling");
-				that.expectCanceledError("Failed to execute /SalesOrderList('2')/" + sAction
+				that.expectCanceledError("Failed to invoke /SalesOrderList('2')/" + sAction
 						+ "(...)", "Action canceled due to strict handling");
 			}
 
@@ -49292,14 +50529,14 @@ make root = ${bMakeRoot}`;
 
 	//*********************************************************************************************
 	// Scenario: "Prefer:handling=strict"
-	// 1. Successful execution of a) a bound and b) an unbound action with "handling=strict" in the
+	// 1. Successful invocation of a) a bound and b) an unbound action with "handling=strict" in the
 	//    same change set
-	// 2. Another execution of a bound action with "handling=strict" in a different change set (of
+	// 2. Another invocation of a bound action with "handling=strict" in a different change set (of
 	//    the same $batch) that will result in a rejection of this action
 	// 3. Test whether "handling=strict" is allowed only for an action
 	//
 	// JIRA: CPOUI5ODATAV4-943
-	QUnit.test("CPOUI5ODATAV4-943: handling=strict, multiple strict executions", function (assert) {
+	QUnit.test("CPOUI5ODATAV4-943: handling=strict, many strict invocations", function (assert) {
 		var sAction = "com.sap.gateway.default.zui5_epm_sample.v0002.SalesOrder_Confirm",
 			oContext,
 			oModel = this.createSalesOrdersModel({autoExpandSelect : true}),
@@ -49319,13 +50556,13 @@ make root = ${bMakeRoot}`;
 			oContext = that.oView.byId("form").getBindingContext();
 
 			that.oLogMock.expects("error")
-				.withExactArgs("Failed to execute /SalesOrderList('0')/"
+				.withExactArgs("Failed to invoke /SalesOrderList('0')/"
 					+ "com.sap.gateway.default.zui5_epm_sample.v0002.SalesOrder_Confirm(...)",
 					sinon.match(
 						"All requests with strict handling must belong to the same change set"),
 					sODCB);
 			that.oLogMock.expects("error")
-				.withExactArgs("Failed to execute /GetProductStock(...)",
+				.withExactArgs("Failed to invoke /GetProductStock(...)",
 					sinon.match("Not an action: /GetProductStock(...)"), sODCB);
 			that.expectRequest({
 					headers : {
@@ -49364,24 +50601,24 @@ make root = ${bMakeRoot}`;
 			return Promise.all([
 				// only to issue a GET request (non change set) at the beginning
 				oModel.bindContext("/GetProductStock(...)")
-					.execute("confirm"),
+					.invoke("confirm"),
 				// code under test (1a)
 				oModel.bindContext(sAction + "(...)", oContext)
-					.execute("confirm", false, function () {}),
+					.invoke("confirm", false, function () {}),
 				// code under test (1b)
 				oModel.bindContext("/RegenerateEPMData(...)")
-					.execute("confirm", false, function () {}),
+					.invoke("confirm", false, function () {}),
 				oModel.submitBatch("confirm"), //create 2nd change set in $batch
 				// code under test (2)
 				oModel.bindContext(sAction + "(...)", oContext)
-					.execute("confirm", false, function () {})
+					.invoke("confirm", false, function () {})
 					.then(mustFail(assert), function (oError) {
 						assert.strictEqual(oError.message,
 							"All requests with strict handling must belong to the same change set");
 					}),
 				// code under test (3)
 				oModel.bindContext("/GetProductStock(...)")
-					.execute("confirm", false, function () {})
+					.invoke("confirm", false, function () {})
 					.then(mustFail(assert), function (oError) {
 						assert.strictEqual(oError.message,
 							"Not an action: /GetProductStock(...)");
@@ -49466,7 +50703,7 @@ make root = ${bMakeRoot}`;
 				}, oError, {
 					"Preference-Applied" : "handling=strict"
 				})
-				.expectCanceledError("Failed to execute /SalesOrderList('42')/" + sGoodsAction
+				.expectCanceledError("Failed to invoke /SalesOrderList('42')/" + sGoodsAction
 					+ "(...)", "Action canceled due to strict handling")
 				.expectMessages([{
 					code : "CODE",
@@ -49479,10 +50716,10 @@ make root = ${bMakeRoot}`;
 
 			// code under test
 			return Promise.all([
-				oConfirmBinding.execute("confirm"),
+				oConfirmBinding.invoke("confirm"),
 				oModel.submitBatch("confirm"),
 				checkCanceled(assert,
-					oGoodsBinding.execute("confirm", false, fnStrictHandlingFailed)),
+					oGoodsBinding.invoke("confirm", false, fnStrictHandlingFailed)),
 				oModel.submitBatch("confirm"),
 				that.waitForChanges(assert)
 			]);
@@ -50336,9 +51573,9 @@ make root = ${bMakeRoot}`;
 	});
 
 	//*********************************************************************************************
-	// Scenario: Executing an action is forbidden for models with shared requests.
+	// Scenario: Invoking an action is forbidden for models with shared requests.
 	// JIRA: CPOUI5ODATAV4-344
-	QUnit.test("sharedRequests forbids action execute", function (assert) {
+	QUnit.test("sharedRequests forbids action invoke", function (assert) {
 		var oModel = this.createTeaBusiModel({sharedRequests : true}),
 			that = this;
 
@@ -50347,10 +51584,10 @@ make root = ${bMakeRoot}`;
 				sMessage = sTeaBusi + "ChangeTeamBudgetByID is read-only";
 
 			that.oLogMock.expects("error")
-				.withExactArgs("Failed to execute /ChangeTeamBudgetByID(...)",
+				.withExactArgs("Failed to invoke /ChangeTeamBudgetByID(...)",
 					sinon.match(sMessage), sODCB);
 
-			return oAction.execute().then(mustFail(assert), function (oError) {
+			return oAction.invoke().then(mustFail(assert), function (oError) {
 				assert.strictEqual(oError.message, sMessage);
 			});
 		});
@@ -50432,7 +51669,7 @@ make root = ${bMakeRoot}`;
 		this.expectChange("name", []);
 
 		return this.createView(assert, sView, oModel).then(function () {
-			// Note: GET triggered by 1st #create - one transient taken into account for prefetch
+			// Note: GET invoked by 1st #create - one transient taken into account for prefetch
 			that.expectRequest("EMPLOYEES?$count=true&$select=ID,Name&$skip=0&$top=3", {
 					"@odata.count" : "1",
 					value : [{ID : "1", Name : "Frederic Fall"}]
@@ -50685,7 +51922,7 @@ make root = ${bMakeRoot}`;
 				// code under test
 				oModel.submitBatch(sGroupId),
 				// code under test (JIRA: CPOUI5ODATAV4-2134)
-				oModel.bindContext("/RegenerateEPMData(...)").execute(sGroupId),
+				oModel.bindContext("/RegenerateEPMData(...)").invoke(sGroupId),
 				oContext1.created(),
 				that.waitForChanges(assert, "(3)")
 			]);
@@ -50940,7 +52177,7 @@ make root = ${bMakeRoot}`;
 	//*********************************************************************************************
 	// Scenario: Apply the filter for messages on a table with persisted and inactive rows, but only
 	// messages for inactive rows. See that the persisted rows disappear w/o a request, and see that
-	// selected APIs do not trigger requests afterwards.
+	// selected APIs do not invoke requests afterwards.
 	// Run each test with a grid table, a responsive table, and a responsive table with growing
 	// enablement. Check that #setAggregation does not work with Filter.NONE, download URL is null,
 	// and #requestContexts (with Filter.NONE) returns transient rows only without a GET request.
@@ -53821,7 +55058,7 @@ make root = ${bMakeRoot}`;
 				}]);
 
 			return Promise.all([
-				oActionBinding.execute(undefined, undefined, undefined, /*bReplaceWithRVC*/true),
+				oActionBinding.invoke(undefined, undefined, undefined, /*bReplaceWithRVC*/true),
 				that.waitForChanges(assert, "(3) edit action")
 			]);
 		}).then(function (aResults) {
@@ -55450,11 +56687,11 @@ make root = ${bMakeRoot}`;
 	//*********************************************************************************************
 	// Scenario: New change requests for the same group ID (e.g. $auto) are submitted before the
 	// previous response arrives, leading to the error "Unexpected second $batch". Here,
-	// ODataContextBinding#execute is used.
+	// ODataContextBinding#invoke is used.
 	// BCP: 2170018878
-	QUnit.test("BCP: 2170018878 via ODCB#execute", function (assert) {
-		var oExecutePromise0,
-			oExecutePromise1,
+	QUnit.test("BCP: 2170018878 via ODCB#invoke", function (assert) {
+		var oInvokePromise0,
+			oInvokePromise1,
 			fnResolveOperation0,
 			fnResolveOperation1,
 			that = this;
@@ -55473,7 +56710,7 @@ make root = ${bMakeRoot}`;
 				}));
 
 			// code under test
-			oExecutePromise0 = oOperationBinding.execute();
+			oInvokePromise0 = oOperationBinding.invoke();
 
 			return that.waitForChanges(assert);
 		}).then(function () {
@@ -55490,17 +56727,17 @@ make root = ${bMakeRoot}`;
 				}));
 
 			// code under test
-			oExecutePromise1 = oOperationBinding.execute();
+			oInvokePromise1 = oOperationBinding.invoke();
 
 			return that.waitForChanges(assert);
 		}).then(function () {
 			fnResolveOperation1();
 
-			return oExecutePromise1;
+			return oInvokePromise1;
 		}).then(function () {
 			fnResolveOperation0();
 
-			return oExecutePromise0;
+			return oInvokePromise0;
 		});
 	});
 
@@ -56109,8 +57346,8 @@ make root = ${bMakeRoot}`;
 
 			return Promise.all([
 				// code under test
-				oAction.execute(),
-				that.waitForChanges(assert, "(1) execute")
+				oAction.invoke(),
+				that.waitForChanges(assert, "(1) invoke")
 			]);
 		}).then(function (aResults) {
 			that.expectChange("note", "some note");
@@ -57206,7 +58443,7 @@ make root = ${bMakeRoot}`;
 				that.waitForChanges(assert, "removeCreated")
 			]);
 		}).then(function () {
-			// Note: this triggers ODLB#destroyPreviousContextsLater, thus we need to wait below
+			// Note: this invokes ODLB#destroyPreviousContextsLater, thus we need to wait below
 			var aAllContexts = oBinding.getAllCurrentContexts();
 
 			assert.strictEqual(aAllContexts.length, 1);
@@ -60163,7 +61400,7 @@ make root = ${bMakeRoot}`;
 	// Scenario:
 	// (1) Binding for a part of a structural instance annotation works without binding the
 	//     property itself
-	// (2) Late request for another annotation of the same property does not trigger a GET request
+	// (2) Late request for another annotation of the same property does not invoke a GET request
 	// (3) Late request for an instance annotation which was not requested before
 	// (4), (5) Edm.Stream simulation: initial response is empty, no further requests
 	// (6) Request side effects for property of (4), empty response
@@ -60926,7 +62163,7 @@ make root = ${bMakeRoot}`;
 	});
 
 	//*********************************************************************************************
-	// Scenario: Create a new draft entity and execute the ActivationAction to replace the draft
+	// Scenario: Create a new draft entity and invoke the ActivationAction to replace the draft
 	// context with the active context. Request a side-effects refresh for the active context.
 	// BCP: 2180347338
 	// BCP: 2280113990
@@ -60996,9 +62233,9 @@ make root = ${bMakeRoot}`;
 
 			return Promise.all([
 				// code under test
-				oActionBinding.execute(/*sGroupId*/undefined, /*bIgnoreETag*/false,
+				oActionBinding.invoke(/*sGroupId*/undefined, /*bIgnoreETag*/false,
 					/*fnOnStrictHandlingFailed*/null, /*bReplaceWithRVC*/true),
-				that.waitForChanges(assert, "execute ActivationAction")
+				that.waitForChanges(assert, "invoke ActivationAction")
 			]);
 		}).then(function (aResults) {
 			oActiveContext = aResults[0];
@@ -61038,7 +62275,7 @@ make root = ${bMakeRoot}`;
 	});
 
 	//*********************************************************************************************
-	// Scenario: In an ODLB w/ filter, but w/o UI, create a new draft entity and execute the
+	// Scenario: In an ODLB w/ filter, but w/o UI, create a new draft entity and invoke the
 	// ActivationAction to replace the draft context with the active context. Refresh the active
 	// context in order to make it drop out of the collection, alternatively delete it. See that
 	// internal bookkeeping is OK by creating an inactive row at the other end.
@@ -61100,8 +62337,8 @@ make root = ${bMakeRoot}`;
 
 			return Promise.all([
 				// code under test
-				oActionBinding.execute(undefined, false, null, /*bReplaceWithRVC*/true),
-				that.waitForChanges(assert, "execute ActivationAction")
+				oActionBinding.invoke(undefined, false, null, /*bReplaceWithRVC*/true),
+				that.waitForChanges(assert, "invoke ActivationAction")
 			]);
 		}).then(function (aResults) {
 			oActiveContext = aResults[0];
@@ -61142,12 +62379,12 @@ make root = ${bMakeRoot}`;
 });
 
 	//*********************************************************************************************
-	// Scenario: In an ODLB w/ filter, but w/o UI, create a new draft entity and execute the
+	// Scenario: In an ODLB w/ filter, but w/o UI, create a new draft entity and invoke the
 	// ActivationAction to replace the draft context with the active context. Keep the active
 	// context alive and refresh it in order to make it drop out of the collection. See that it is
 	// still alive.
 	//
-	// Execute the EditAction with empty response to check that bReplaceWithRVC requires a key
+	// Invoke the EditAction with empty response to check that bReplaceWithRVC requires a key
 	// predicate.
 	// JIRA: CPOUI5ODATAV4-1683
 	QUnit.test("JIRA: CPOUI5ODATAV4-1683", function (assert) {
@@ -61193,8 +62430,8 @@ make root = ${bMakeRoot}`;
 
 			return Promise.all([
 				// code under test
-				oActionBinding.execute(undefined, false, null, /*bReplaceWithRVC*/true),
-				that.waitForChanges(assert, "execute ActivationAction")
+				oActionBinding.invoke(undefined, false, null, /*bReplaceWithRVC*/true),
+				that.waitForChanges(assert, "invoke ActivationAction")
 			]);
 		}).then(function (aResults) {
 			oActiveContext = aResults[0];
@@ -61236,18 +62473,18 @@ make root = ${bMakeRoot}`;
 					type : "Error"
 				}]);
 			that.oLogMock.expects("error")
-				.withExactArgs("Failed to execute /Artists(ArtistID='23',IsActiveEntity=true)"
+				.withExactArgs("Failed to invoke /Artists(ArtistID='23',IsActiveEntity=true)"
 					+ "/special.cases.EditAction(...)",
 					sinon.match("Cannot replace w/o return value context"), sODCB);
 
 			return Promise.all([
 				// code under test
-				oActionBinding.execute(undefined, false, null, /*bReplaceWithRVC*/true)
+				oActionBinding.invoke(undefined, false, null, /*bReplaceWithRVC*/true)
 					.then(mustFail(assert), function (oError) {
 						assert.strictEqual(oError.message,
 							"Cannot replace w/o return value context");
 					}),
-				that.waitForChanges(assert, "execute EditAction")
+				that.waitForChanges(assert, "invoke EditAction")
 			]);
 		});
 	});
@@ -61315,7 +62552,7 @@ make root = ${bMakeRoot}`;
 
 	//*********************************************************************************************
 	// Scenario: A return value context is destroyed as soon as a new cache is created during
-	// #execute, no matter what happens after that.
+	// #invoke, no matter what happens after that.
 	//
 	// JIRA: CPOUI5ODATAV4-1687
 	QUnit.test("JIRA: CPOUI5ODATAV4-1687", function (assert) {
@@ -61356,7 +62593,7 @@ make root = ${bMakeRoot}`;
 				.expectChange("team", "TEAM_02");
 
 			return Promise.all([
-				oActionBinding.execute(),
+				oActionBinding.invoke(),
 				that.waitForChanges(assert)
 			]);
 		}).then(function (aResults) {
@@ -61377,7 +62614,7 @@ make root = ${bMakeRoot}`;
 
 			return Promise.all([
 				// code under test
-				oActionBinding.setParameter("TeamID", "TEAM_0815").execute(),
+				oActionBinding.setParameter("TeamID", "TEAM_0815").invoke(),
 				that.waitForChanges(assert)
 			]);
 		}).then(function (aResults) {
@@ -61427,7 +62664,7 @@ make root = ${bMakeRoot}`;
 			});
 
 			return Promise.all([
-				oAction.execute(),
+				oAction.invoke(),
 				that.waitForChanges(assert, "edit")
 			]);
 		}).then(function (aResults) {
@@ -62246,7 +63483,7 @@ make root = ${bMakeRoot}`;
 
 			return Promise.all([
 				// code under test
-				oSiblingEntity.execute("$auto", /*bIgnoreETag*/false,
+				oSiblingEntity.invoke("$auto", /*bIgnoreETag*/false,
 					/*fnOnStrictHandlingFailed*/null, /*bReplaceWithRVC*/true),
 				that.waitForChanges(assert, "SiblingEntity")
 			]);
@@ -62343,6 +63580,7 @@ make root = ${bMakeRoot}`;
 	// ODM#submitBatch. Expect that the latter's promise does not resolve before the create request
 	// is completed.
 	// BCP: 2370151708
+	// No "sap-cancel-on-close" header in POST request (JIRA: CPOUI5ODATAV4-2506)
 	QUnit.test("BCP: 2370151708 - submitBatch includes create ($auto)", async function (assert) {
 		const oModel = this.createTeaBusiModel({autoExpandSelect : true});
 		await this.createView(assert, "", oModel);
@@ -62350,6 +63588,7 @@ make root = ${bMakeRoot}`;
 		let fnResolveCreate;
 		this.expectRequest({
 				method : "POST",
+				headers : {/*NO "sap-cancel-on-close"*/},
 				payload : {},
 				url : "EMPLOYEES"
 			}, new Promise(function (resolve) {
@@ -62377,11 +63616,11 @@ make root = ${bMakeRoot}`;
 	});
 
 	//*********************************************************************************************
-	// Scenario: Execute actions and delete rows using group id "$single" and "$direct". Observe
-	// that each execute and delete request using "$single" is in its own batch request and does not
+	// Scenario: Invoke actions and delete rows using group id "$single" and "$direct". Observe
+	// that each invoke and delete request using "$single" is in its own batch request and does not
 	// get overtaken by the "$direct" request.
 	// JIRA: CPOUI5ODATAV4-2413
-	QUnit.test("Execute and delete immediately using groupId='$single'", async function (assert) {
+	QUnit.test("Invoke and delete immediately using groupId='$single'", async function (assert) {
 		const oModel = this.createSalesOrdersModel({autoExpandSelect : true});
 		const sView = `
 <Table id="orders" items="{/SalesOrderList}">
@@ -62433,9 +63672,9 @@ make root = ${bMakeRoot}`;
 		const oContextBinding1 = oModel.bindContext(sAction + "(...)", oContext1);
 		const oContextBinding2 = oModel.bindContext(sAction + "(...)", oContext2);
 
-		const oRVCPromise0 = oContextBinding0.execute("$single");
-		const oRVCPromise1 = oContextBinding1.execute("$single");
-		const oRVCPromise2 = oContextBinding2.execute("$direct");
+		const oRVCPromise0 = oContextBinding0.invoke("$single");
+		const oRVCPromise1 = oContextBinding1.invoke("$single");
+		const oRVCPromise2 = oContextBinding2.invoke("$direct");
 
 		await Promise.all([
 			// code under test
@@ -62508,31 +63747,35 @@ make root = ${bMakeRoot}`;
 	// JIRA: CPOUI5ODATAV4-1944
 	//
 	// Select a header context via all three possible ways: setSelected and write to the annotation
-	// via context or property binding. Swap the context of the "selectAll" property binding and
-	// check if change listeners are correctly removed.
+	// via context or property binding. Selecting the header context selects and deselects all row
+	// contexts. A newly created inactive (and transient) row is also selected. Newly loaded rows
+	// inherit the selection from the header context. Swap the context of the "select all" property
+	// binding and check if change listeners are correctly removed.
 	// JIRA: CPOUI5ODATAV4-2493
 	QUnit.test("Selection on header context and row context", async function (assert) {
 		const oModel = this.createSalesOrdersModel({autoExpandSelect : true});
 		const sView = `
 <Input id="selectAll" value="{path: '@$ui5.context.isSelected', targetType: 'any'}"/>
-<Table id="table" items="{/SalesOrderList}">
+<Table id="table" growing="true" growingThreshold="3" items="{/SalesOrderList}">
 	<Text id="id" text="{SalesOrderID}"/>
 	<Input id="selected" value="{path : '@$ui5.context.isSelected', targetType: 'any'}"/>
 </Table>`;
 
-		this.expectRequest("SalesOrderList?$select=SalesOrderID&$skip=0&$top=100", {
+		this.expectRequest("SalesOrderList?$select=SalesOrderID&$skip=0&$top=3", {
 				value : [
-					{SalesOrderID : "1"}
-				]
+						{SalesOrderID : "1"},
+						{SalesOrderID : "2"},
+						{SalesOrderID : "3"}
+					]
 			})
 			.expectChange("selectAll")
-			.expectChange("id", ["1"])
-			.expectChange("selected", [undefined]);
+			.expectChange("id", ["1", "2", "3"])
+			.expectChange("selected", [undefined, undefined, undefined]);
 
 		await this.createView(assert, sView, oModel);
 
-		const oPropertyBinding = this.oView.byId("table").getItems()[0].getCells()[1]
-			.getBinding("value");
+		const oTable = this.oView.byId("table");
+		const oPropertyBinding = oTable.getItems()[0].getCells()[1].getBinding("value");
 		const oContext = oPropertyBinding.getContext();
 
 		this.expectChange("selected", [true]);
@@ -62541,7 +63784,7 @@ make root = ${bMakeRoot}`;
 		oPropertyBinding.setValue(true);
 
 		checkSelected(assert, oContext, true);
-		await this.waitForChanges(assert);
+		await this.waitForChanges(assert, "rowContext selected");
 
 		this.expectChange("selected", [false]);
 
@@ -62549,67 +63792,104 @@ make root = ${bMakeRoot}`;
 		oPropertyBinding.setValue(false);
 
 		checkSelected(assert, oContext, false);
-		await this.waitForChanges(assert);
+		await this.waitForChanges(assert, "rowContext deselected");
 
-		const oHeaderContext = this.oView.byId("table").getBinding("items").getHeaderContext();
+		const oListBinding = oTable.getBinding("items");
+		const oHeaderContext = oListBinding.getHeaderContext();
 		const oSelectAllInput = this.oView.byId("selectAll");
 		oSelectAllInput.setBindingContext(oHeaderContext);
 		const oSelectAllBinding = oSelectAllInput.getBinding("value");
 
-		this.expectChange("selectAll", true);
+		this.expectChange("selectAll", true)
+			.expectChange("selected", [true, true, true]);
 
 		// code under test
 		oSelectAllBinding.setValue(true);
 
 		checkSelected(assert, oHeaderContext, true);
-		await this.waitForChanges(assert);
+		await this.waitForChanges(assert, "headerContext selected via setValue");
+
+		this.expectChange("id", [""])
+			.expectChange("selected", [true]);
+
+		// code under test - newly created row context is selected
+		const oInactiveContext = oListBinding.create(undefined, true, false, true);
+
+		assert.ok(oInactiveContext.isTransient());
+		assert.ok(oInactiveContext.isInactive());
+		assert.ok(oInactiveContext.isSelected());
+
+		await this.waitForChanges(assert, "new row is selected");
 
-		this.expectChange("selectAll", false);
+		this.expectChange("selectAll", false)
+			.expectChange("selected", [false, false, false]);
 
 		// code under test
 		oSelectAllBinding.setValue(false);
 
 		checkSelected(assert, oHeaderContext, false);
-		await this.waitForChanges(assert);
+		await this.waitForChanges(assert, "headerContext deselected via setValue");
 
-		this.expectChange("selectAll", true);
+		this.expectChange("selectAll", true)
+			.expectChange("selected", [true, true, true]);
 
 		// code under test
 		oHeaderContext.setProperty("@$ui5.context.isSelected", true);
 
 		checkSelected(assert, oHeaderContext, true);
-		await this.waitForChanges(assert);
+		await this.waitForChanges(assert, "headerContext selected via setProperty");
 
-		this.expectChange("selectAll", false);
+		this.expectChange("selectAll", false)
+			.expectChange("selected", [false, false, false]);
 
 		// code under test
 		oHeaderContext.setProperty("@$ui5.context.isSelected", false);
 
 		checkSelected(assert, oHeaderContext, false);
-		await this.waitForChanges(assert);
+		await this.waitForChanges(assert, "headerContext deselected via setProperty");
 
-		this.expectChange("selectAll", true);
+		this.expectChange("selectAll", true)
+			.expectChange("selected", [true, true, true]);
 
 		// code under test
 		oHeaderContext.setSelected(true);
 
 		checkSelected(assert, oHeaderContext, true);
-		await this.waitForChanges(assert);
+		await this.waitForChanges(assert, "headerContext selected via setSelected");
 
-		this.expectChange("selectAll", false);
+		this.expectRequest("SalesOrderList?$select=SalesOrderID&$skip=3&$top=2", {
+				value : [
+					{SalesOrderID : "4"},
+					{SalesOrderID : "5"}
+				]
+			})
+			.expectChange("id", [,,, "3", "4", "5"])
+			.expectChange("selected", [,,, true, true, true]);
+
+		// code under test
+		oTable.requestItems();
+
+		await this.waitForChanges(assert, "contexts created by paging are also selected");
+
+		this.expectChange("selectAll", false)
+			.expectChange("selected", [false, false, false, false, false, false]);
 
 		// code under test
 		oHeaderContext.setSelected(false);
 
 		checkSelected(assert, oHeaderContext, false);
-		await this.waitForChanges(assert);
+		await this.waitForChanges(assert, "headerContext deselected via setSelected");
 
-		oSelectAllInput.setBindingContext(oContext);
+		this.expectChange("selectAll", true); // for setBindingContext
 
-		// code under test - change listener is deregistered, no change expected
-		oHeaderContext.setSelected(true);
+		const oNewListBinding = this.oModel.bindList("/SalesOrderList");
+		oNewListBinding.getHeaderContext().setSelected(true);
+		oSelectAllInput.setBindingContext(oNewListBinding.getHeaderContext());
 
-		await this.waitForChanges(assert);
+		// code under test - no further change expected for "select all" binding
+		oHeaderContext.setSelected(false);
+
+		await this.waitForChanges(assert, "swap context of property binding");
 	});
 
 	//*********************************************************************************************