diff --git a/UPGRADING.md b/UPGRADING.md
index 6227a17ba..cdc5f21ac 100644
--- a/UPGRADING.md
+++ b/UPGRADING.md
@@ -89,6 +89,8 @@ upgrade.
are removed with the payment gateways ([#295](https://github.com/apache/ofbiz-plugins/pull/295)).
* The controller no longer declares the `http` view handler
([#426](https://github.com/apache/ofbiz-plugins/pull/426)).
+* The `getJs` and `js` requests are removed with the `multi-block` script extraction
+ ([OFBIZ-13831](https://issues.apache.org/jira/browse/OFBIZ-13831)). See the framework notes.
### example
diff --git a/ecommerce/webapp/ecommerce/WEB-INF/controller.xml b/ecommerce/webapp/ecommerce/WEB-INF/controller.xml
index 20c97cec2..9a37c0dab 100644
--- a/ecommerce/webapp/ecommerce/WEB-INF/controller.xml
+++ b/ecommerce/webapp/ecommerce/WEB-INF/controller.xml
@@ -168,19 +168,6 @@ under the License.
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/ecommerce/widget/CartScreens.xml b/ecommerce/widget/CartScreens.xml
index 6e86d18ee..4014ab311 100644
--- a/ecommerce/widget/CartScreens.xml
+++ b/ecommerce/widget/CartScreens.xml
@@ -82,7 +82,7 @@ under the License.
-
+
diff --git a/ecommerce/widget/CatalogScreens.xml b/ecommerce/widget/CatalogScreens.xml
index 4ddb26f18..ab5009c58 100644
--- a/ecommerce/widget/CatalogScreens.xml
+++ b/ecommerce/widget/CatalogScreens.xml
@@ -143,7 +143,7 @@ under the License.
-
+
@@ -226,7 +226,7 @@ under the License.
-
+
@@ -299,7 +299,7 @@ under the License.
-
+
@@ -325,7 +325,7 @@ under the License.
-
+
@@ -379,7 +379,7 @@ under the License.
@@ -564,7 +564,7 @@ under the License.
-
+
diff --git a/ecommerce/widget/CommonScreens.xml b/ecommerce/widget/CommonScreens.xml
index a4cce4e49..fc8db5bd4 100644
--- a/ecommerce/widget/CommonScreens.xml
+++ b/ecommerce/widget/CommonScreens.xml
@@ -82,7 +82,7 @@ under the License.
-
+
@@ -293,7 +293,7 @@ under the License.
-
+
@@ -352,7 +352,7 @@ under the License.
-
+
@@ -373,7 +373,7 @@ under the License.
-
+
diff --git a/ecommerce/widget/CustomerScreens.xml b/ecommerce/widget/CustomerScreens.xml
index 5cca3636b..ad26ffcdb 100644
--- a/ecommerce/widget/CustomerScreens.xml
+++ b/ecommerce/widget/CustomerScreens.xml
@@ -638,7 +638,7 @@ under the License.
-
+
@@ -659,7 +659,7 @@ under the License.
-
+
diff --git a/ecommerce/widget/EmailContactListScreens.xml b/ecommerce/widget/EmailContactListScreens.xml
index a59346a5a..410929784 100644
--- a/ecommerce/widget/EmailContactListScreens.xml
+++ b/ecommerce/widget/EmailContactListScreens.xml
@@ -44,7 +44,7 @@ under the License.
-
+
diff --git a/ecommerce/widget/EmailProductScreens.xml b/ecommerce/widget/EmailProductScreens.xml
index 7df36f48c..99bddacea 100644
--- a/ecommerce/widget/EmailProductScreens.xml
+++ b/ecommerce/widget/EmailProductScreens.xml
@@ -27,7 +27,7 @@ under the License.
-
+
diff --git a/ecommerce/widget/OrderScreens.xml b/ecommerce/widget/OrderScreens.xml
index bba1ec906..0ad4759c7 100644
--- a/ecommerce/widget/OrderScreens.xml
+++ b/ecommerce/widget/OrderScreens.xml
@@ -66,7 +66,7 @@ under the License.
-
+
@@ -192,7 +192,7 @@ under the License.
-
+
@@ -212,7 +212,7 @@ under the License.
-
+
@@ -232,7 +232,7 @@ under the License.
-
+
@@ -254,7 +254,7 @@ under the License.
-
+
@@ -272,7 +272,7 @@ under the License.
-
+
@@ -293,7 +293,7 @@ under the License.
-
+
@@ -312,7 +312,7 @@ under the License.
-
+
@@ -329,7 +329,7 @@ under the License.
-
+
@@ -433,7 +433,7 @@ under the License.
-
+
@@ -497,7 +497,7 @@ under the License.
-
+
@@ -510,7 +510,7 @@ under the License.
-
+
@@ -525,7 +525,7 @@ under the License.
-
+
@@ -546,7 +546,7 @@ under the License.
-
+
@@ -566,7 +566,7 @@ under the License.
-
+
@@ -586,7 +586,7 @@ under the License.
-
+
@@ -663,7 +663,7 @@ under the License.
-
+
diff --git a/ecommerce/widget/ShoppingListScreens.xml b/ecommerce/widget/ShoppingListScreens.xml
index 31e2b2f3f..cc9f5aed6 100644
--- a/ecommerce/widget/ShoppingListScreens.xml
+++ b/ecommerce/widget/ShoppingListScreens.xml
@@ -33,7 +33,7 @@ under the License.
-
+
@@ -61,7 +61,7 @@ under the License.
-
+
diff --git a/example/widget/example/FormWidgetExampleScreens.xml b/example/widget/example/FormWidgetExampleScreens.xml
index 90c6a63a2..15263e8a8 100644
--- a/example/widget/example/FormWidgetExampleScreens.xml
+++ b/example/widget/example/FormWidgetExampleScreens.xml
@@ -77,8 +77,8 @@ under the License.
-
-
+
+
@@ -110,7 +110,7 @@ under the License.
-
+
diff --git a/projectmgr/widget/ProjectScreens.xml b/projectmgr/widget/ProjectScreens.xml
index c0143a491..717726bb7 100644
--- a/projectmgr/widget/ProjectScreens.xml
+++ b/projectmgr/widget/ProjectScreens.xml
@@ -434,7 +434,7 @@ under the License.
-
+
diff --git a/projectmgr/widget/TaskScreens.xml b/projectmgr/widget/TaskScreens.xml
index 402536598..a0a633f9f 100644
--- a/projectmgr/widget/TaskScreens.xml
+++ b/projectmgr/widget/TaskScreens.xml
@@ -182,7 +182,7 @@ under the License.
-
+
diff --git a/projectmgr/widget/TimeSheetScreens.xml b/projectmgr/widget/TimeSheetScreens.xml
index c474f2abc..1b34f37d6 100644
--- a/projectmgr/widget/TimeSheetScreens.xml
+++ b/projectmgr/widget/TimeSheetScreens.xml
@@ -42,7 +42,7 @@ under the License.
-
+