diff --git a/backend-app/build.gradle b/backend-app/build.gradle
index 41f289a..a3ac851 100644
--- a/backend-app/build.gradle
+++ b/backend-app/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'io.jmix' version '2.4.0'
+    id 'io.jmix' version '2.5.0-M1'
     id 'java'
     id 'org.jetbrains.gradle.plugin.idea-ext' version '1.1.9'
 }
@@ -8,13 +8,14 @@ apply plugin: 'org.springframework.boot'
 apply plugin: 'com.vaadin'
 
 jmix {
-    bomVersion = '2.4.0'
+    bomVersion = '2.5.999-SNAPSHOT'
 }
 
 group = 'com.company'
 version = '0.0.1-SNAPSHOT'
 
 repositories {
+    mavenLocal()
     mavenCentral()
     maven {
         url 'https://global.repo.jmix.io/repository/public'
diff --git a/backend-app/src/main/resources/application.properties b/backend-app/src/main/resources/application.properties
index 0fb826d..a42c575 100644
--- a/backend-app/src/main/resources/application.properties
+++ b/backend-app/src/main/resources/application.properties
@@ -15,7 +15,6 @@ ui.login.defaultUsername = admin
 ui.login.defaultPassword = admin
 
 jmix.core.available-locales = en
-jmix.core.fetch-plans-config=com/company/backend/fetch-plans.xml
 
 # Launch the default browser when starting the application in development mode
 vaadin.launch-browser = false
diff --git a/backend-app/src/main/resources/com/company/backend/fetch-plans.xml b/backend-app/src/main/resources/com/company/backend/fetch-plans.xml
deleted file mode 100644
index 54db383..0000000
--- a/backend-app/src/main/resources/com/company/backend/fetch-plans.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<fetchPlans xmlns="http://jmix.io/schema/core/fetch-plans">
-    <fetchPlan class="com.company.backend.entity.Department" name="department-with-hrManager" extends="_base">
-        <property name="hrManager" fetchPlan="_base"/>
-    </fetchPlan>
-    <fetchPlan class="com.company.backend.entity.User" name="user-with-department" extends="_base">
-        <property name="department" fetchPlan="_base"/>
-    </fetchPlan>
-    <fetchPlan class="com.company.backend.entity.User" name="user-full" extends="_base">
-        <property name="department" fetchPlan="_base"/>
-        <property name="steps" fetchPlan="_base">
-            <property name="step" fetchPlan="_base"/>
-        </property>
-    </fetchPlan>
-</fetchPlans>
\ No newline at end of file
diff --git a/doc/modules/separate-tiers-guide/pages/index.adoc b/doc/modules/separate-tiers-guide/pages/index.adoc
index 8918b0b..b025dc9 100644
--- a/doc/modules/separate-tiers-guide/pages/index.adoc
+++ b/doc/modules/separate-tiers-guide/pages/index.adoc
@@ -141,27 +141,13 @@ include::example$/frontend-app/src/main/java/com/company/frontend/entity/Departm
 [[fetch-plans]]
 === Fetch Plans
 
-The generic REST API xref:rest:entities-api/load-entities.adoc#fetch-plans[currently supports] only named fetch plans defined in xref:data-access:fetching.adoc#creating-fetch-plans[fetch plans repository]. So the Backend and Frontend applications contain identical fetch plans and use their names when loading data.
-
-[source,xml,indent=0]
-.backend-app/src/main/resources/com/company/backend/fetch-plans.xml
-----
-include::example$/backend-app/src/main/resources/com/company/backend/fetch-plans.xml[]
-----
-
-[source,xml,indent=0]
-.frontend-app/src/main/resources/com/company/frontend/fetch-plans.xml
-----
-include::example$/frontend-app/src/main/resources/com/company/frontend/fetch-plans.xml[]
-----
+Since Jmix 2.5, the generic REST API supports both named fetch plans defined in xref:data-access:fetching.adoc#creating-fetch-plans[fetch plans repository] and inline fetch plans defined in view descriptors or created programmatically. So the Backend and Frontend applications use fetch plans for JPA and DTO entities in the same way.
 
 [[views]]
 === Views
 
 The Frontend views are mostly identical to the views of the basic Onboarding application, with the following differences:
 
-* Named fetch plans are used instead of inline fetch plans.
-
 * `MyOnboardingView` defines the query in the JSON format of the REST API instead of JPQL:
 +
 [source,xml,indent=0]
diff --git a/frontend-app/build.gradle b/frontend-app/build.gradle
index 25e36fe..71c101e 100644
--- a/frontend-app/build.gradle
+++ b/frontend-app/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id 'io.jmix' version '2.4.0'
+    id 'io.jmix' version '2.5.0-M1'
     id 'java'
     id 'org.jetbrains.gradle.plugin.idea-ext' version '1.1.9'
 }
@@ -8,13 +8,14 @@ apply plugin: 'org.springframework.boot'
 apply plugin: 'com.vaadin'
 
 jmix {
-    bomVersion = '2.4.0'
+    bomVersion = '2.5.999-SNAPSHOT'
 }
 
 group = 'com.company'
 version = '0.0.1-SNAPSHOT'
 
 repositories {
+    mavenLocal()
     mavenCentral()
     maven {
         url 'https://global.repo.jmix.io/repository/public'
diff --git a/frontend-app/src/main/resources/application.properties b/frontend-app/src/main/resources/application.properties
index d4dec7c..b9af7ae 100644
--- a/frontend-app/src/main/resources/application.properties
+++ b/frontend-app/src/main/resources/application.properties
@@ -12,8 +12,6 @@ jmix.restds.authentication-provider-store = backend
 # end::auth-provider-store[]
 # end::rest-data-store[]
 
-jmix.core.fetch-plans-config=com/company/frontend/fetch-plans.xml
-
 main.datasource.url = jdbc:hsqldb:file:.jmix/hsqldb/frontendapp
 main.datasource.username = sa
 main.datasource.password =
diff --git a/frontend-app/src/main/resources/com/company/frontend/fetch-plans.xml b/frontend-app/src/main/resources/com/company/frontend/fetch-plans.xml
deleted file mode 100644
index 60c0760..0000000
--- a/frontend-app/src/main/resources/com/company/frontend/fetch-plans.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<fetchPlans xmlns="http://jmix.io/schema/core/fetch-plans">
-    <fetchPlan class="com.company.frontend.entity.Department" name="department-with-hrManager" extends="_base">
-        <property name="hrManager" fetchPlan="_base"/>
-    </fetchPlan>
-    <fetchPlan class="com.company.frontend.entity.User" name="user-with-department" extends="_base">
-        <property name="department" fetchPlan="_base"/>
-    </fetchPlan>
-    <fetchPlan class="com.company.frontend.entity.User" name="user-full" extends="_base">
-        <property name="department" fetchPlan="_base"/>
-        <property name="steps" fetchPlan="_base">
-            <property name="step" fetchPlan="_base"/>
-        </property>
-    </fetchPlan>
-</fetchPlans>
\ No newline at end of file
diff --git a/frontend-app/src/main/resources/com/company/frontend/view/department/department-detail-view.xml b/frontend-app/src/main/resources/com/company/frontend/view/department/department-detail-view.xml
index a6857bf..f097ee6 100644
--- a/frontend-app/src/main/resources/com/company/frontend/view/department/department-detail-view.xml
+++ b/frontend-app/src/main/resources/com/company/frontend/view/department/department-detail-view.xml
@@ -4,8 +4,10 @@
       focusComponent="form">
     <data>
         <instance id="departmentDc"
-                  class="com.company.frontend.entity.Department"
-                  fetchPlan="department-with-hrManager">
+                  class="com.company.frontend.entity.Department">
+            <fetchPlan extends="_base">
+                <property name="hrManager" fetchPlan="_base"/>
+            </fetchPlan>
             <loader/>
         </instance>
     </data>
diff --git a/frontend-app/src/main/resources/com/company/frontend/view/department/department-list-view.xml b/frontend-app/src/main/resources/com/company/frontend/view/department/department-list-view.xml
index 5190a58..47e4254 100644
--- a/frontend-app/src/main/resources/com/company/frontend/view/department/department-list-view.xml
+++ b/frontend-app/src/main/resources/com/company/frontend/view/department/department-list-view.xml
@@ -4,8 +4,10 @@
       focusComponent="departmentsDataGrid">
     <data>
         <collection id="departmentsDc"
-                    class="com.company.frontend.entity.Department"
-                    fetchPlan="department-with-hrManager">
+                    class="com.company.frontend.entity.Department">
+            <fetchPlan extends="_base">
+                <property name="hrManager" fetchPlan="_base"/>
+            </fetchPlan>
             <loader id="departmentsDl" readOnly="true"/>
         </collection>
     </data>
diff --git a/frontend-app/src/main/resources/com/company/frontend/view/user/user-detail-view.xml b/frontend-app/src/main/resources/com/company/frontend/view/user/user-detail-view.xml
index c9346c7..6b7bbfe 100644
--- a/frontend-app/src/main/resources/com/company/frontend/view/user/user-detail-view.xml
+++ b/frontend-app/src/main/resources/com/company/frontend/view/user/user-detail-view.xml
@@ -4,8 +4,13 @@
       focusComponent="form">
     <data>
         <instance id="userDc"
-                  class="com.company.frontend.entity.User"
-                  fetchPlan="user-full">
+                  class="com.company.frontend.entity.User">
+            <fetchPlan extends="_base">
+                <property name="department" fetchPlan="_base"/>
+                <property name="steps" fetchPlan="_base">
+                    <property name="step" fetchPlan="_base"/>
+                </property>
+            </fetchPlan>
             <loader/>
             <collection id="stepsDc" property="steps"/>
         </instance>
diff --git a/frontend-app/src/main/resources/com/company/frontend/view/user/user-list-view.xml b/frontend-app/src/main/resources/com/company/frontend/view/user/user-list-view.xml
index 4fe252f..30c4fd5 100644
--- a/frontend-app/src/main/resources/com/company/frontend/view/user/user-list-view.xml
+++ b/frontend-app/src/main/resources/com/company/frontend/view/user/user-list-view.xml
@@ -4,8 +4,10 @@
       focusComponent="usersDataGrid">
     <data>
         <collection id="usersDc"
-                    class="com.company.frontend.entity.User"
-                    fetchPlan="user-with-department">
+                    class="com.company.frontend.entity.User">
+            <fetchPlan extends="_base">
+                <property name="department" fetchPlan="_base"/>
+            </fetchPlan>
             <loader id="usersDl" readOnly="true"/>
         </collection>
     </data>
diff --git a/jmix-studio.xml b/jmix-studio.xml
index 9810acb..5fcf09e 100644
--- a/jmix-studio.xml
+++ b/jmix-studio.xml
@@ -2,6 +2,19 @@
 <project version="4">
   <component name="JmixDataStoreSettingsManager">
     <moduleSettings>
+      <entry key="backend-app.main">
+        <ModuleSettings>
+          <option name="dataStoreOptionsV2">
+            <map>
+              <entry key="main">
+                <value>
+                  <DataStoreSettingsV2 />
+                </value>
+              </entry>
+            </map>
+          </option>
+        </ModuleSettings>
+      </entry>
       <entry key="com.company.backend-app.main">
         <ModuleSettings>
           <option name="dataStoreOptionsV2">
@@ -32,6 +45,19 @@
           </option>
         </ModuleSettings>
       </entry>
+      <entry key="frontend-app.main">
+        <ModuleSettings>
+          <option name="dataStoreOptionsV2">
+            <map>
+              <entry key="main">
+                <value>
+                  <DataStoreSettingsV2 />
+                </value>
+              </entry>
+            </map>
+          </option>
+        </ModuleSettings>
+      </entry>
     </moduleSettings>
   </component>
 </project>
\ No newline at end of file