diff --git a/admin/tool/cohortroles/db/upgrade.php b/admin/tool/cohortroles/db/upgrade.php
index 7984d25e3bb..899c39e5438 100644
--- a/admin/tool/cohortroles/db/upgrade.php
+++ b/admin/tool/cohortroles/db/upgrade.php
@@ -44,5 +44,8 @@ function xmldb_tool_cohortroles_upgrade($oldversion) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/admin/tool/customlang/db/upgrade.php b/admin/tool/customlang/db/upgrade.php
index a0706da08f8..e1318d6c545 100644
--- a/admin/tool/customlang/db/upgrade.php
+++ b/admin/tool/customlang/db/upgrade.php
@@ -41,5 +41,8 @@ function xmldb_tool_customlang_upgrade($oldversion) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/admin/tool/dataprivacy/db/upgrade.php b/admin/tool/dataprivacy/db/upgrade.php
index 0748ccbe699..7d2ab3c6378 100644
--- a/admin/tool/dataprivacy/db/upgrade.php
+++ b/admin/tool/dataprivacy/db/upgrade.php
@@ -78,5 +78,8 @@ function xmldb_tool_dataprivacy_upgrade($oldversion) {
         upgrade_plugin_savepoint(true, 2020061501, 'tool', 'dataprivacy');
     }
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/admin/tool/log/db/upgrade.php b/admin/tool/log/db/upgrade.php
index c7fdc68c44e..d36e5a29324 100644
--- a/admin/tool/log/db/upgrade.php
+++ b/admin/tool/log/db/upgrade.php
@@ -45,5 +45,8 @@ function xmldb_tool_log_upgrade($oldversion) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/admin/tool/log/store/database/db/upgrade.php b/admin/tool/log/store/database/db/upgrade.php
index 0384c386487..d8bb4b88675 100644
--- a/admin/tool/log/store/database/db/upgrade.php
+++ b/admin/tool/log/store/database/db/upgrade.php
@@ -46,5 +46,8 @@ function xmldb_logstore_database_upgrade($oldversion) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/admin/tool/log/store/standard/db/upgrade.php b/admin/tool/log/store/standard/db/upgrade.php
index 0f6da04df6e..f2e66d0afca 100644
--- a/admin/tool/log/store/standard/db/upgrade.php
+++ b/admin/tool/log/store/standard/db/upgrade.php
@@ -46,5 +46,8 @@ function xmldb_logstore_standard_upgrade($oldversion) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/admin/tool/mobile/db/upgrade.php b/admin/tool/mobile/db/upgrade.php
index ace131e4a4a..800f0e98091 100644
--- a/admin/tool/mobile/db/upgrade.php
+++ b/admin/tool/mobile/db/upgrade.php
@@ -51,5 +51,8 @@ function xmldb_tool_mobile_upgrade($oldversion) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/admin/tool/monitor/db/upgrade.php b/admin/tool/monitor/db/upgrade.php
index a84a9641493..3c5edfedfcb 100644
--- a/admin/tool/monitor/db/upgrade.php
+++ b/admin/tool/monitor/db/upgrade.php
@@ -45,5 +45,8 @@ function xmldb_tool_monitor_upgrade($oldversion) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/admin/tool/moodlenet/db/upgrade.php b/admin/tool/moodlenet/db/upgrade.php
index 3161378375a..935670c0064 100644
--- a/admin/tool/moodlenet/db/upgrade.php
+++ b/admin/tool/moodlenet/db/upgrade.php
@@ -164,5 +164,8 @@ function xmldb_tool_moodlenet_upgrade(int $oldversion) {
         upgrade_plugin_savepoint(true, 2022021601, 'tool', 'moodlenet');
     }
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/admin/tool/policy/db/upgrade.php b/admin/tool/policy/db/upgrade.php
index 9ef2107f2aa..5b45b303e65 100644
--- a/admin/tool/policy/db/upgrade.php
+++ b/admin/tool/policy/db/upgrade.php
@@ -46,5 +46,8 @@ function xmldb_tool_policy_upgrade($oldversion) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/admin/tool/usertours/db/upgrade.php b/admin/tool/usertours/db/upgrade.php
index 7540a87fb1f..e1443c3065a 100644
--- a/admin/tool/usertours/db/upgrade.php
+++ b/admin/tool/usertours/db/upgrade.php
@@ -129,5 +129,8 @@ function xmldb_tool_usertours_upgrade($oldversion) {
         upgrade_plugin_savepoint(true, 2022040602, 'tool', 'usertours');
     }
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/auth/cas/db/upgrade.php b/auth/cas/db/upgrade.php
index abff53bf2a9..2123590fbc1 100644
--- a/auth/cas/db/upgrade.php
+++ b/auth/cas/db/upgrade.php
@@ -52,5 +52,8 @@ function xmldb_auth_cas_upgrade($oldversion) {
         upgrade_plugin_savepoint(true, 2021052501, 'auth', 'cas');
     }
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/auth/db/db/upgrade.php b/auth/db/db/upgrade.php
index beb5ff19d64..77e956a4e67 100644
--- a/auth/db/db/upgrade.php
+++ b/auth/db/db/upgrade.php
@@ -44,5 +44,8 @@ function xmldb_auth_db_upgrade($oldversion) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/auth/email/db/upgrade.php b/auth/email/db/upgrade.php
index 28ab12ff551..ce7bc16f200 100644
--- a/auth/email/db/upgrade.php
+++ b/auth/email/db/upgrade.php
@@ -44,5 +44,8 @@ function xmldb_auth_email_upgrade($oldversion) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/auth/ldap/db/upgrade.php b/auth/ldap/db/upgrade.php
index ce9f85e6153..aefeeae32cc 100644
--- a/auth/ldap/db/upgrade.php
+++ b/auth/ldap/db/upgrade.php
@@ -52,5 +52,8 @@ function xmldb_auth_ldap_upgrade($oldversion) {
         upgrade_plugin_savepoint(true, 2021052501, 'auth', 'ldap');
     }
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/auth/lti/db/upgrade.php b/auth/lti/db/upgrade.php
index 602ff45de00..7166b0357cf 100644
--- a/auth/lti/db/upgrade.php
+++ b/auth/lti/db/upgrade.php
@@ -85,5 +85,8 @@ function xmldb_auth_lti_upgrade($oldversion) {
         upgrade_plugin_savepoint(true, 2022030900, 'auth', 'lti');
     }
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/auth/manual/db/upgrade.php b/auth/manual/db/upgrade.php
index 836cfafd2bd..bb03f71a5b6 100644
--- a/auth/manual/db/upgrade.php
+++ b/auth/manual/db/upgrade.php
@@ -44,5 +44,8 @@ function xmldb_auth_manual_upgrade($oldversion) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/auth/mnet/db/upgrade.php b/auth/mnet/db/upgrade.php
index 3c354c40c17..3264f35c970 100644
--- a/auth/mnet/db/upgrade.php
+++ b/auth/mnet/db/upgrade.php
@@ -44,5 +44,8 @@ function xmldb_auth_mnet_upgrade($oldversion) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/auth/none/db/upgrade.php b/auth/none/db/upgrade.php
index 7b575393655..5bda9d12d33 100644
--- a/auth/none/db/upgrade.php
+++ b/auth/none/db/upgrade.php
@@ -44,5 +44,8 @@ function xmldb_auth_none_upgrade($oldversion) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/auth/oauth2/db/upgrade.php b/auth/oauth2/db/upgrade.php
index 0a6bb5d14d8..8627ce61729 100644
--- a/auth/oauth2/db/upgrade.php
+++ b/auth/oauth2/db/upgrade.php
@@ -81,5 +81,8 @@ function xmldb_auth_oauth2_upgrade($oldversion) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/auth/shibboleth/db/upgrade.php b/auth/shibboleth/db/upgrade.php
index 6cbabb39477..772c5829d82 100644
--- a/auth/shibboleth/db/upgrade.php
+++ b/auth/shibboleth/db/upgrade.php
@@ -66,5 +66,8 @@ function xmldb_auth_shibboleth_upgrade($oldversion) {
         upgrade_plugin_savepoint(true, 2021052501, 'auth', 'shibboleth');
     }
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/blocks/badges/db/upgrade.php b/blocks/badges/db/upgrade.php
index 413b03634f1..43f4e4bab27 100644
--- a/blocks/badges/db/upgrade.php
+++ b/blocks/badges/db/upgrade.php
@@ -57,5 +57,8 @@ function xmldb_block_badges_upgrade($oldversion, $block) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/blocks/calendar_month/db/upgrade.php b/blocks/calendar_month/db/upgrade.php
index 8eb2ab84580..8aa35f5f492 100644
--- a/blocks/calendar_month/db/upgrade.php
+++ b/blocks/calendar_month/db/upgrade.php
@@ -72,5 +72,8 @@ function xmldb_block_calendar_month_upgrade($oldversion, $block) {
         upgrade_block_savepoint(true, 2022041901, 'calendar_month', false);
     }
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/blocks/calendar_upcoming/db/upgrade.php b/blocks/calendar_upcoming/db/upgrade.php
index e70285f94e1..9c5be729205 100644
--- a/blocks/calendar_upcoming/db/upgrade.php
+++ b/blocks/calendar_upcoming/db/upgrade.php
@@ -57,5 +57,8 @@ function xmldb_block_calendar_upcoming_upgrade($oldversion, $block) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/blocks/completionstatus/db/upgrade.php b/blocks/completionstatus/db/upgrade.php
index daccb412d17..f4bc358f7cd 100644
--- a/blocks/completionstatus/db/upgrade.php
+++ b/blocks/completionstatus/db/upgrade.php
@@ -60,5 +60,8 @@ function xmldb_block_completionstatus_upgrade($oldversion, $block) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/blocks/course_summary/db/upgrade.php b/blocks/course_summary/db/upgrade.php
index 4cbe17fffce..2ef89cb040b 100644
--- a/blocks/course_summary/db/upgrade.php
+++ b/blocks/course_summary/db/upgrade.php
@@ -71,5 +71,8 @@ function xmldb_block_course_summary_upgrade($oldversion, $block) {
         upgrade_block_savepoint(true, 2021121600, 'course_summary', false);
     }
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/blocks/feedback/db/upgrade.php b/blocks/feedback/db/upgrade.php
index b70a3b843f9..5aaf1fcd841 100644
--- a/blocks/feedback/db/upgrade.php
+++ b/blocks/feedback/db/upgrade.php
@@ -58,5 +58,8 @@ function xmldb_block_feedback_upgrade($oldversion, $block) {
         upgrade_block_savepoint(true, 2021121600, 'feedback', false);
     }
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/blocks/html/db/upgrade.php b/blocks/html/db/upgrade.php
index baefecafed6..e09a469589e 100644
--- a/blocks/html/db/upgrade.php
+++ b/blocks/html/db/upgrade.php
@@ -45,5 +45,8 @@ function xmldb_block_html_upgrade($oldversion) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/blocks/myoverview/db/upgrade.php b/blocks/myoverview/db/upgrade.php
index 5f7aed8258e..cdd2203ef4c 100644
--- a/blocks/myoverview/db/upgrade.php
+++ b/blocks/myoverview/db/upgrade.php
@@ -120,5 +120,8 @@ function xmldb_block_myoverview_upgrade($oldversion) {
         upgrade_block_savepoint(true, 2022041901, 'myoverview', false);
     }
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/blocks/navigation/db/upgrade.php b/blocks/navigation/db/upgrade.php
index 802c2eceefe..67b3b4b7bdf 100644
--- a/blocks/navigation/db/upgrade.php
+++ b/blocks/navigation/db/upgrade.php
@@ -67,5 +67,8 @@ function xmldb_block_navigation_upgrade($oldversion, $block) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/blocks/recent_activity/db/upgrade.php b/blocks/recent_activity/db/upgrade.php
index f510e708f36..24e7a8676df 100644
--- a/blocks/recent_activity/db/upgrade.php
+++ b/blocks/recent_activity/db/upgrade.php
@@ -59,5 +59,8 @@ function xmldb_block_recent_activity_upgrade($oldversion, $block) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/blocks/recentlyaccesseditems/db/upgrade.php b/blocks/recentlyaccesseditems/db/upgrade.php
index 34c4ac33460..e0cf93332cf 100644
--- a/blocks/recentlyaccesseditems/db/upgrade.php
+++ b/blocks/recentlyaccesseditems/db/upgrade.php
@@ -88,5 +88,8 @@ function xmldb_block_recentlyaccesseditems_upgrade($oldversion, $block) {
         upgrade_block_savepoint(true, 2022041901, 'recentlyaccesseditems', false);
     }
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/blocks/rss_client/db/upgrade.php b/blocks/rss_client/db/upgrade.php
index c9a6305cbb4..e01c79936de 100644
--- a/blocks/rss_client/db/upgrade.php
+++ b/blocks/rss_client/db/upgrade.php
@@ -56,5 +56,8 @@ function xmldb_block_rss_client_upgrade($oldversion) {
         upgrade_block_savepoint(true, 2021121600, 'rss_client', false);
     }
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/blocks/section_links/db/upgrade.php b/blocks/section_links/db/upgrade.php
index bd7baf27165..1549c7b364e 100644
--- a/blocks/section_links/db/upgrade.php
+++ b/blocks/section_links/db/upgrade.php
@@ -61,5 +61,8 @@ function xmldb_block_section_links_upgrade($oldversion, $block) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/blocks/selfcompletion/db/upgrade.php b/blocks/selfcompletion/db/upgrade.php
index ac66fe99297..ffb8dfc99c3 100644
--- a/blocks/selfcompletion/db/upgrade.php
+++ b/blocks/selfcompletion/db/upgrade.php
@@ -71,5 +71,8 @@ function xmldb_block_selfcompletion_upgrade($oldversion, $block) {
         upgrade_block_savepoint(true, 2021121600, 'selfcompletion', false);
     }
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/blocks/settings/db/upgrade.php b/blocks/settings/db/upgrade.php
index aa49b1ba81b..32963387bcf 100644
--- a/blocks/settings/db/upgrade.php
+++ b/blocks/settings/db/upgrade.php
@@ -67,5 +67,8 @@ function xmldb_block_settings_upgrade($oldversion, $block) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/blocks/tag_youtube/db/upgrade.php b/blocks/tag_youtube/db/upgrade.php
index fc0bf34f27c..5fb1ea65e01 100644
--- a/blocks/tag_youtube/db/upgrade.php
+++ b/blocks/tag_youtube/db/upgrade.php
@@ -132,5 +132,8 @@ function xmldb_block_tag_youtube_upgrade($oldversion) {
         upgrade_block_savepoint(true, 2021052501, 'tag_youtube', false);
     }
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/blocks/timeline/db/upgrade.php b/blocks/timeline/db/upgrade.php
index e4e0d3dae7e..bc05e0738f7 100644
--- a/blocks/timeline/db/upgrade.php
+++ b/blocks/timeline/db/upgrade.php
@@ -71,5 +71,8 @@ function xmldb_block_timeline_upgrade($oldversion, $block) {
         upgrade_block_savepoint(true, 2022041901, 'timeline', false);
     }
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/course/format/topics/db/upgrade.php b/course/format/topics/db/upgrade.php
index fe3184c6fa1..5ac1908711e 100644
--- a/course/format/topics/db/upgrade.php
+++ b/course/format/topics/db/upgrade.php
@@ -45,5 +45,8 @@ function xmldb_format_topics_upgrade($oldversion) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/course/format/weeks/db/upgrade.php b/course/format/weeks/db/upgrade.php
index 37ee465bc7f..a7f06f6ab27 100644
--- a/course/format/weeks/db/upgrade.php
+++ b/course/format/weeks/db/upgrade.php
@@ -45,5 +45,8 @@ function xmldb_format_weeks_upgrade($oldversion) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/enrol/database/db/upgrade.php b/enrol/database/db/upgrade.php
index 857512aa6dc..11267b11df4 100644
--- a/enrol/database/db/upgrade.php
+++ b/enrol/database/db/upgrade.php
@@ -39,5 +39,8 @@ function xmldb_enrol_database_upgrade($oldversion) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/enrol/flatfile/db/upgrade.php b/enrol/flatfile/db/upgrade.php
index 884b7eb5a59..6dce6a99488 100644
--- a/enrol/flatfile/db/upgrade.php
+++ b/enrol/flatfile/db/upgrade.php
@@ -39,5 +39,8 @@ function xmldb_enrol_flatfile_upgrade($oldversion) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/enrol/guest/db/upgrade.php b/enrol/guest/db/upgrade.php
index f99788cb8b8..0ccf3dbdc01 100644
--- a/enrol/guest/db/upgrade.php
+++ b/enrol/guest/db/upgrade.php
@@ -39,5 +39,8 @@ function xmldb_enrol_guest_upgrade($oldversion) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/enrol/imsenterprise/db/upgrade.php b/enrol/imsenterprise/db/upgrade.php
index 37a3bf3f813..2b0aa1828e3 100644
--- a/enrol/imsenterprise/db/upgrade.php
+++ b/enrol/imsenterprise/db/upgrade.php
@@ -45,5 +45,8 @@ function xmldb_enrol_imsenterprise_upgrade($oldversion) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/enrol/lti/db/upgrade.php b/enrol/lti/db/upgrade.php
index d133d663293..3b852efc25f 100644
--- a/enrol/lti/db/upgrade.php
+++ b/enrol/lti/db/upgrade.php
@@ -456,5 +456,8 @@ function xmldb_enrol_lti_upgrade($oldversion) {
         upgrade_plugin_savepoint(true, 2022031402, 'enrol', 'lti');
     }
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/enrol/manual/db/upgrade.php b/enrol/manual/db/upgrade.php
index 3aaad56d0bd..0dfb8696b66 100644
--- a/enrol/manual/db/upgrade.php
+++ b/enrol/manual/db/upgrade.php
@@ -39,5 +39,8 @@ function xmldb_enrol_manual_upgrade($oldversion) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/enrol/mnet/db/upgrade.php b/enrol/mnet/db/upgrade.php
index f57b1297dd6..078d69125c3 100644
--- a/enrol/mnet/db/upgrade.php
+++ b/enrol/mnet/db/upgrade.php
@@ -39,5 +39,8 @@ function xmldb_enrol_mnet_upgrade($oldversion) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/enrol/paypal/db/upgrade.php b/enrol/paypal/db/upgrade.php
index 7248861b2f1..1f9dff709a5 100644
--- a/enrol/paypal/db/upgrade.php
+++ b/enrol/paypal/db/upgrade.php
@@ -57,5 +57,8 @@ function xmldb_enrol_paypal_upgrade($oldversion) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/enrol/self/db/upgrade.php b/enrol/self/db/upgrade.php
index 45d11001ccf..9d8bf12fada 100644
--- a/enrol/self/db/upgrade.php
+++ b/enrol/self/db/upgrade.php
@@ -39,5 +39,8 @@ function xmldb_enrol_self_upgrade($oldversion) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/filter/displayh5p/db/upgrade.php b/filter/displayh5p/db/upgrade.php
index cc5d0390ab5..e001cac4f98 100644
--- a/filter/displayh5p/db/upgrade.php
+++ b/filter/displayh5p/db/upgrade.php
@@ -60,5 +60,8 @@ function xmldb_filter_displayh5p_upgrade($oldversion) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/filter/mathjaxloader/db/upgrade.php b/filter/mathjaxloader/db/upgrade.php
index 18ee85fc575..0570b109679 100644
--- a/filter/mathjaxloader/db/upgrade.php
+++ b/filter/mathjaxloader/db/upgrade.php
@@ -67,5 +67,8 @@ function xmldb_filter_mathjaxloader_upgrade($oldversion) {
         upgrade_plugin_savepoint(true, 2021052501, 'filter', 'mathjaxloader');
     }
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/filter/mediaplugin/db/upgrade.php b/filter/mediaplugin/db/upgrade.php
index 0c3739036d5..f65a05a0f24 100644
--- a/filter/mediaplugin/db/upgrade.php
+++ b/filter/mediaplugin/db/upgrade.php
@@ -44,5 +44,8 @@ function xmldb_filter_mediaplugin_upgrade($oldversion) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/filter/tex/db/upgrade.php b/filter/tex/db/upgrade.php
index 2c98b8af6e3..be5b12e7315 100644
--- a/filter/tex/db/upgrade.php
+++ b/filter/tex/db/upgrade.php
@@ -44,5 +44,8 @@ function xmldb_filter_tex_upgrade($oldversion) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/grade/grading/form/guide/db/upgrade.php b/grade/grading/form/guide/db/upgrade.php
index 62ab96d5209..ad84f2aef7a 100644
--- a/grade/grading/form/guide/db/upgrade.php
+++ b/grade/grading/form/guide/db/upgrade.php
@@ -49,5 +49,8 @@ function xmldb_gradingform_guide_upgrade($oldversion) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/grade/grading/form/rubric/db/upgrade.php b/grade/grading/form/rubric/db/upgrade.php
index 16e799e6ca1..1cdeff373dd 100644
--- a/grade/grading/form/rubric/db/upgrade.php
+++ b/grade/grading/form/rubric/db/upgrade.php
@@ -45,5 +45,8 @@ function xmldb_gradingform_rubric_upgrade($oldversion) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/grade/report/history/db/upgrade.php b/grade/report/history/db/upgrade.php
index 119d7b497c5..6c71b973ff7 100644
--- a/grade/report/history/db/upgrade.php
+++ b/grade/report/history/db/upgrade.php
@@ -46,5 +46,8 @@ function xmldb_gradereport_history_upgrade($oldversion) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/grade/report/overview/db/upgrade.php b/grade/report/overview/db/upgrade.php
index 3d7960d1189..e0432d49869 100644
--- a/grade/report/overview/db/upgrade.php
+++ b/grade/report/overview/db/upgrade.php
@@ -44,5 +44,8 @@ function xmldb_gradereport_overview_upgrade($oldversion) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/grade/report/user/db/upgrade.php b/grade/report/user/db/upgrade.php
index 2bf738166c7..04aa32482ad 100644
--- a/grade/report/user/db/upgrade.php
+++ b/grade/report/user/db/upgrade.php
@@ -41,5 +41,8 @@ function xmldb_gradereport_user_upgrade($oldversion) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/lib/antivirus/clamav/db/upgrade.php b/lib/antivirus/clamav/db/upgrade.php
index 3f3225f3fd5..f021179b4aa 100644
--- a/lib/antivirus/clamav/db/upgrade.php
+++ b/lib/antivirus/clamav/db/upgrade.php
@@ -44,5 +44,8 @@ function xmldb_antivirus_clamav_upgrade($oldversion) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php
index f169fad88ab..73017c7bbd4 100644
--- a/lib/db/upgrade.php
+++ b/lib/db/upgrade.php
@@ -4473,5 +4473,8 @@ privatefiles,moodle|/user/files.php';
         upgrade_main_savepoint(true, 2022041200.01);
     }
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/lib/editor/atto/db/upgrade.php b/lib/editor/atto/db/upgrade.php
index c22007b3c83..8fe00c36002 100644
--- a/lib/editor/atto/db/upgrade.php
+++ b/lib/editor/atto/db/upgrade.php
@@ -141,5 +141,8 @@ other = html';
         upgrade_plugin_savepoint(true, 2021062400, 'editor', 'atto');
     }
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/lib/editor/atto/plugins/equation/db/upgrade.php b/lib/editor/atto/plugins/equation/db/upgrade.php
index 09769687fc7..be720c047e4 100644
--- a/lib/editor/atto/plugins/equation/db/upgrade.php
+++ b/lib/editor/atto/plugins/equation/db/upgrade.php
@@ -44,5 +44,8 @@ function xmldb_atto_equation_upgrade($oldversion) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/lib/editor/atto/plugins/recordrtc/db/upgrade.php b/lib/editor/atto/plugins/recordrtc/db/upgrade.php
index 13333ad4762..a5dfb774f50 100644
--- a/lib/editor/atto/plugins/recordrtc/db/upgrade.php
+++ b/lib/editor/atto/plugins/recordrtc/db/upgrade.php
@@ -44,5 +44,9 @@ function xmldb_atto_recordrtc_upgrade($oldversion) {
         // Recordrtc savepoint reached.
         upgrade_plugin_savepoint(true, 2021073000, 'atto', 'recordrtc');
     }
+
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/lib/editor/tinymce/db/upgrade.php b/lib/editor/tinymce/db/upgrade.php
index 176bbed0302..54318c6e333 100644
--- a/lib/editor/tinymce/db/upgrade.php
+++ b/lib/editor/tinymce/db/upgrade.php
@@ -39,5 +39,8 @@ function xmldb_editor_tinymce_upgrade($oldversion) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/lib/editor/tinymce/plugins/spellchecker/db/upgrade.php b/lib/editor/tinymce/plugins/spellchecker/db/upgrade.php
index 095a44d9017..94b01aa8bdf 100644
--- a/lib/editor/tinymce/plugins/spellchecker/db/upgrade.php
+++ b/lib/editor/tinymce/plugins/spellchecker/db/upgrade.php
@@ -39,5 +39,8 @@ function xmldb_tinymce_spellchecker_upgrade($oldversion) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/media/player/videojs/db/upgrade.php b/media/player/videojs/db/upgrade.php
index e9bbe4bb8b7..ee6bc4511f8 100644
--- a/media/player/videojs/db/upgrade.php
+++ b/media/player/videojs/db/upgrade.php
@@ -62,5 +62,8 @@ function xmldb_media_videojs_upgrade($oldversion) {
         upgrade_plugin_savepoint(true, 2021052503, 'media', 'videojs');
     }
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/message/output/email/db/upgrade.php b/message/output/email/db/upgrade.php
index 96cfa95dbae..30bd74f9408 100644
--- a/message/output/email/db/upgrade.php
+++ b/message/output/email/db/upgrade.php
@@ -71,5 +71,8 @@ function xmldb_message_email_upgrade($oldversion) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/message/output/popup/db/upgrade.php b/message/output/popup/db/upgrade.php
index be04744dab4..7296a1c3d19 100644
--- a/message/output/popup/db/upgrade.php
+++ b/message/output/popup/db/upgrade.php
@@ -69,5 +69,8 @@ function xmldb_message_popup_upgrade($oldversion) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/assign/db/upgrade.php b/mod/assign/db/upgrade.php
index 0e592e4baf6..fd8bd7aa3ac 100644
--- a/mod/assign/db/upgrade.php
+++ b/mod/assign/db/upgrade.php
@@ -112,5 +112,8 @@ function xmldb_assign_upgrade($oldversion) {
         upgrade_mod_savepoint(true, 2021110901, 'assign');
     }
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/assign/feedback/comments/db/upgrade.php b/mod/assign/feedback/comments/db/upgrade.php
index e1f7935356b..35a01705b08 100644
--- a/mod/assign/feedback/comments/db/upgrade.php
+++ b/mod/assign/feedback/comments/db/upgrade.php
@@ -44,5 +44,8 @@ function xmldb_assignfeedback_comments_upgrade($oldversion) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/assign/feedback/editpdf/db/upgrade.php b/mod/assign/feedback/editpdf/db/upgrade.php
index 1649f7640cb..55747adb549 100644
--- a/mod/assign/feedback/editpdf/db/upgrade.php
+++ b/mod/assign/feedback/editpdf/db/upgrade.php
@@ -92,5 +92,8 @@ function xmldb_assignfeedback_editpdf_upgrade($oldversion) {
         upgrade_plugin_savepoint(true, 2021060400, 'assignfeedback', 'editpdf');
     }
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/assign/feedback/file/db/upgrade.php b/mod/assign/feedback/file/db/upgrade.php
index 3cf8ece6830..0a53e1307f1 100644
--- a/mod/assign/feedback/file/db/upgrade.php
+++ b/mod/assign/feedback/file/db/upgrade.php
@@ -44,5 +44,8 @@ function xmldb_assignfeedback_file_upgrade($oldversion) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/assign/submission/comments/db/upgrade.php b/mod/assign/submission/comments/db/upgrade.php
index d2620962d2f..4bffd778122 100644
--- a/mod/assign/submission/comments/db/upgrade.php
+++ b/mod/assign/submission/comments/db/upgrade.php
@@ -44,5 +44,8 @@ function xmldb_assignsubmission_comments_upgrade($oldversion) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/assign/submission/file/db/upgrade.php b/mod/assign/submission/file/db/upgrade.php
index d9214aef059..f096ace8856 100644
--- a/mod/assign/submission/file/db/upgrade.php
+++ b/mod/assign/submission/file/db/upgrade.php
@@ -44,5 +44,8 @@ function xmldb_assignsubmission_file_upgrade($oldversion) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/assign/submission/onlinetext/db/upgrade.php b/mod/assign/submission/onlinetext/db/upgrade.php
index 9b1e223c748..ed84c5bc4f3 100644
--- a/mod/assign/submission/onlinetext/db/upgrade.php
+++ b/mod/assign/submission/onlinetext/db/upgrade.php
@@ -44,5 +44,8 @@ function xmldb_assignsubmission_onlinetext_upgrade($oldversion) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/assignment/db/upgrade.php b/mod/assignment/db/upgrade.php
index 8f65de3e383..82d122eb16a 100644
--- a/mod/assignment/db/upgrade.php
+++ b/mod/assignment/db/upgrade.php
@@ -36,5 +36,8 @@ function xmldb_assignment_upgrade($oldversion) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/bigbluebuttonbn/db/upgrade.php b/mod/bigbluebuttonbn/db/upgrade.php
index 25ae36ea92a..c51e7fff2e5 100644
--- a/mod/bigbluebuttonbn/db/upgrade.php
+++ b/mod/bigbluebuttonbn/db/upgrade.php
@@ -415,6 +415,9 @@ function xmldb_bigbluebuttonbn_upgrade($oldversion = 0) {
         upgrade_mod_savepoint(true, 2022021601, 'bigbluebuttonbn');
     }
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
 
diff --git a/mod/book/db/upgrade.php b/mod/book/db/upgrade.php
index c386dee3c05..b3f700ce6dd 100644
--- a/mod/book/db/upgrade.php
+++ b/mod/book/db/upgrade.php
@@ -55,5 +55,8 @@ function xmldb_book_upgrade($oldversion) {
         upgrade_mod_savepoint(true, 2021052501, 'book');
     }
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/chat/db/upgrade.php b/mod/chat/db/upgrade.php
index bd0d96936d4..9afe701c36e 100644
--- a/mod/chat/db/upgrade.php
+++ b/mod/chat/db/upgrade.php
@@ -39,5 +39,8 @@ function xmldb_chat_upgrade($oldversion) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/choice/db/upgrade.php b/mod/choice/db/upgrade.php
index 4215bba4d39..0f68b1131bb 100644
--- a/mod/choice/db/upgrade.php
+++ b/mod/choice/db/upgrade.php
@@ -50,5 +50,8 @@ function xmldb_choice_upgrade($oldversion) {
         // Choice savepoint reached.
         upgrade_mod_savepoint(true, 2020061600, 'choice');
     }
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/data/db/upgrade.php b/mod/data/db/upgrade.php
index 9ab8b6022bd..010ed6408c1 100644
--- a/mod/data/db/upgrade.php
+++ b/mod/data/db/upgrade.php
@@ -53,5 +53,8 @@ function xmldb_data_upgrade($oldversion) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/feedback/db/upgrade.php b/mod/feedback/db/upgrade.php
index 418459c1704..ad13f90f6c6 100644
--- a/mod/feedback/db/upgrade.php
+++ b/mod/feedback/db/upgrade.php
@@ -56,5 +56,8 @@ function xmldb_feedback_upgrade($oldversion) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/folder/db/upgrade.php b/mod/folder/db/upgrade.php
index 08889e17a3b..e9e5e74d9ef 100644
--- a/mod/folder/db/upgrade.php
+++ b/mod/folder/db/upgrade.php
@@ -75,5 +75,8 @@ function xmldb_folder_upgrade($oldversion) {
         upgrade_mod_savepoint(true, 2021052501, 'folder');
     }
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/forum/db/upgrade.php b/mod/forum/db/upgrade.php
index c6b87ef583e..c48863680b0 100644
--- a/mod/forum/db/upgrade.php
+++ b/mod/forum/db/upgrade.php
@@ -335,5 +335,8 @@ function xmldb_forum_upgrade($oldversion) {
         upgrade_mod_savepoint(true, 2021101101, 'forum');
     }
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/glossary/db/upgrade.php b/mod/glossary/db/upgrade.php
index 8d59689133c..ebbf95ecb7a 100644
--- a/mod/glossary/db/upgrade.php
+++ b/mod/glossary/db/upgrade.php
@@ -34,5 +34,8 @@ function xmldb_glossary_upgrade($oldversion) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/h5pactivity/db/upgrade.php b/mod/h5pactivity/db/upgrade.php
index 8773c2293a1..07fe84b5866 100644
--- a/mod/h5pactivity/db/upgrade.php
+++ b/mod/h5pactivity/db/upgrade.php
@@ -243,5 +243,8 @@ function xmldb_h5pactivity_upgrade($oldversion) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/imscp/db/upgrade.php b/mod/imscp/db/upgrade.php
index 52293fdca0e..cc45c11d308 100644
--- a/mod/imscp/db/upgrade.php
+++ b/mod/imscp/db/upgrade.php
@@ -43,5 +43,8 @@ function xmldb_imscp_upgrade($oldversion) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/label/db/upgrade.php b/mod/label/db/upgrade.php
index e4158b1966e..a1baf5d6278 100644
--- a/mod/label/db/upgrade.php
+++ b/mod/label/db/upgrade.php
@@ -59,5 +59,8 @@ function xmldb_label_upgrade($oldversion) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/lesson/db/upgrade.php b/mod/lesson/db/upgrade.php
index 874f8398926..c04f8779644 100644
--- a/mod/lesson/db/upgrade.php
+++ b/mod/lesson/db/upgrade.php
@@ -64,5 +64,8 @@ function xmldb_lesson_upgrade($oldversion) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/lti/db/upgrade.php b/mod/lti/db/upgrade.php
index 9d0db81315b..9c56ed8af47 100644
--- a/mod/lti/db/upgrade.php
+++ b/mod/lti/db/upgrade.php
@@ -205,5 +205,8 @@ function xmldb_lti_upgrade($oldversion) {
         upgrade_mod_savepoint(true, 2022032900, 'lti');
     }
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/lti/service/gradebookservices/db/upgrade.php b/mod/lti/service/gradebookservices/db/upgrade.php
index 46d5d42cd76..1327d1c0f87 100644
--- a/mod/lti/service/gradebookservices/db/upgrade.php
+++ b/mod/lti/service/gradebookservices/db/upgrade.php
@@ -110,5 +110,8 @@ function xmldb_ltiservice_gradebookservices_upgrade($oldversion) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/page/db/upgrade.php b/mod/page/db/upgrade.php
index ac29ab32449..fadde9a07f7 100644
--- a/mod/page/db/upgrade.php
+++ b/mod/page/db/upgrade.php
@@ -59,5 +59,8 @@ function xmldb_page_upgrade($oldversion) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/quiz/accessrule/seb/db/upgrade.php b/mod/quiz/accessrule/seb/db/upgrade.php
index d581b44ec7e..f2f9639d873 100644
--- a/mod/quiz/accessrule/seb/db/upgrade.php
+++ b/mod/quiz/accessrule/seb/db/upgrade.php
@@ -40,5 +40,8 @@ function xmldb_quizaccess_seb_upgrade($oldversion) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/quiz/db/upgrade.php b/mod/quiz/db/upgrade.php
index 03a530ab2c0..98ed984381b 100644
--- a/mod/quiz/db/upgrade.php
+++ b/mod/quiz/db/upgrade.php
@@ -166,5 +166,8 @@ function xmldb_quiz_upgrade($oldversion) {
         upgrade_mod_savepoint(true, 2022020300, 'quiz');
     }
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/quiz/report/overview/db/upgrade.php b/mod/quiz/report/overview/db/upgrade.php
index b2078902c26..79a49c6fad6 100644
--- a/mod/quiz/report/overview/db/upgrade.php
+++ b/mod/quiz/report/overview/db/upgrade.php
@@ -45,5 +45,8 @@ function xmldb_quiz_overview_upgrade($oldversion) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/quiz/report/statistics/db/upgrade.php b/mod/quiz/report/statistics/db/upgrade.php
index f2a19ea629c..88be859cdd4 100644
--- a/mod/quiz/report/statistics/db/upgrade.php
+++ b/mod/quiz/report/statistics/db/upgrade.php
@@ -42,5 +42,8 @@ function xmldb_quiz_statistics_upgrade($oldversion) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/resource/db/upgrade.php b/mod/resource/db/upgrade.php
index 916380f3e1c..693bbbdd534 100644
--- a/mod/resource/db/upgrade.php
+++ b/mod/resource/db/upgrade.php
@@ -59,5 +59,8 @@ function xmldb_resource_upgrade($oldversion) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/scorm/db/upgrade.php b/mod/scorm/db/upgrade.php
index d426e2d625c..8f70776ca7d 100644
--- a/mod/scorm/db/upgrade.php
+++ b/mod/scorm/db/upgrade.php
@@ -68,5 +68,8 @@ function xmldb_scorm_upgrade($oldversion) {
         upgrade_mod_savepoint(true, 2021052501, 'scorm');
     }
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/survey/db/upgrade.php b/mod/survey/db/upgrade.php
index 8be9b2e66cf..60e4d2a569d 100644
--- a/mod/survey/db/upgrade.php
+++ b/mod/survey/db/upgrade.php
@@ -36,5 +36,8 @@ function xmldb_survey_upgrade($oldversion) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/url/db/upgrade.php b/mod/url/db/upgrade.php
index 05eb26d0286..c55da89b9cc 100644
--- a/mod/url/db/upgrade.php
+++ b/mod/url/db/upgrade.php
@@ -59,5 +59,8 @@ function xmldb_url_upgrade($oldversion) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/wiki/db/upgrade.php b/mod/wiki/db/upgrade.php
index 5c1cd52be20..74f3a5844f3 100644
--- a/mod/wiki/db/upgrade.php
+++ b/mod/wiki/db/upgrade.php
@@ -52,5 +52,8 @@ function xmldb_wiki_upgrade($oldversion) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/workshop/db/upgrade.php b/mod/workshop/db/upgrade.php
index 2bf08d29c89..9c02464cd84 100644
--- a/mod/workshop/db/upgrade.php
+++ b/mod/workshop/db/upgrade.php
@@ -64,5 +64,8 @@ function xmldb_workshop_upgrade($oldversion) {
         upgrade_mod_savepoint(true, 2021052501, 'workshop');
     }
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/workshop/form/accumulative/db/upgrade.php b/mod/workshop/form/accumulative/db/upgrade.php
index 66461232cfb..1d760457463 100644
--- a/mod/workshop/form/accumulative/db/upgrade.php
+++ b/mod/workshop/form/accumulative/db/upgrade.php
@@ -45,5 +45,8 @@ function xmldb_workshopform_accumulative_upgrade($oldversion) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/workshop/form/comments/db/upgrade.php b/mod/workshop/form/comments/db/upgrade.php
index b4d021eaa60..b6b05f64903 100644
--- a/mod/workshop/form/comments/db/upgrade.php
+++ b/mod/workshop/form/comments/db/upgrade.php
@@ -45,5 +45,8 @@ function xmldb_workshopform_comments_upgrade($oldversion) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/workshop/form/numerrors/db/upgrade.php b/mod/workshop/form/numerrors/db/upgrade.php
index 1670a6613fe..ea4cf9db74e 100644
--- a/mod/workshop/form/numerrors/db/upgrade.php
+++ b/mod/workshop/form/numerrors/db/upgrade.php
@@ -45,5 +45,8 @@ function xmldb_workshopform_numerrors_upgrade($oldversion) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/mod/workshop/form/rubric/db/upgrade.php b/mod/workshop/form/rubric/db/upgrade.php
index ae3fe06b8c8..596e83ba400 100644
--- a/mod/workshop/form/rubric/db/upgrade.php
+++ b/mod/workshop/form/rubric/db/upgrade.php
@@ -45,5 +45,8 @@ function xmldb_workshopform_rubric_upgrade($oldversion) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/payment/gateway/paypal/db/upgrade.php b/payment/gateway/paypal/db/upgrade.php
index a14a3564b9b..6bd294c9cad 100644
--- a/payment/gateway/paypal/db/upgrade.php
+++ b/payment/gateway/paypal/db/upgrade.php
@@ -47,5 +47,8 @@ function xmldb_paygw_paypal_upgrade(int $oldversion): bool {
         upgrade_plugin_savepoint(true, 2021052501, 'paygw', 'paypal');
     }
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/portfolio/googledocs/db/upgrade.php b/portfolio/googledocs/db/upgrade.php
index a4246ebbcd0..cd2b5c1d99f 100644
--- a/portfolio/googledocs/db/upgrade.php
+++ b/portfolio/googledocs/db/upgrade.php
@@ -35,5 +35,8 @@ function xmldb_portfolio_googledocs_upgrade($oldversion) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/question/behaviour/manualgraded/db/upgrade.php b/question/behaviour/manualgraded/db/upgrade.php
index acee0ac54bb..f1e9311952b 100644
--- a/question/behaviour/manualgraded/db/upgrade.php
+++ b/question/behaviour/manualgraded/db/upgrade.php
@@ -42,5 +42,8 @@ function xmldb_qbehaviour_manualgraded_upgrade($oldversion) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/question/type/calculated/db/upgrade.php b/question/type/calculated/db/upgrade.php
index 5d6e4d2193c..57eab3ecc2e 100644
--- a/question/type/calculated/db/upgrade.php
+++ b/question/type/calculated/db/upgrade.php
@@ -44,5 +44,8 @@ function xmldb_qtype_calculated_upgrade($oldversion) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/question/type/ddmarker/db/upgrade.php b/question/type/ddmarker/db/upgrade.php
index 6bd5b460668..942b6864a66 100644
--- a/question/type/ddmarker/db/upgrade.php
+++ b/question/type/ddmarker/db/upgrade.php
@@ -45,5 +45,8 @@ function xmldb_qtype_ddmarker_upgrade($oldversion) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/question/type/essay/db/upgrade.php b/question/type/essay/db/upgrade.php
index d655b8746c4..b06f9be34e5 100644
--- a/question/type/essay/db/upgrade.php
+++ b/question/type/essay/db/upgrade.php
@@ -86,5 +86,8 @@ function xmldb_qtype_essay_upgrade($oldversion) {
         upgrade_plugin_savepoint(true, 2021052502, 'qtype', 'essay');
     }
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/question/type/match/db/upgrade.php b/question/type/match/db/upgrade.php
index 1adf811b5d7..bbd5618fc04 100644
--- a/question/type/match/db/upgrade.php
+++ b/question/type/match/db/upgrade.php
@@ -43,5 +43,8 @@ function xmldb_qtype_match_upgrade($oldversion) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/question/type/multianswer/db/upgrade.php b/question/type/multianswer/db/upgrade.php
index 793ff2cf0d9..d52f539d31f 100644
--- a/question/type/multianswer/db/upgrade.php
+++ b/question/type/multianswer/db/upgrade.php
@@ -44,5 +44,8 @@ function xmldb_qtype_multianswer_upgrade($oldversion) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/question/type/multichoice/db/upgrade.php b/question/type/multichoice/db/upgrade.php
index b8e6a29f463..bde5eda44dd 100644
--- a/question/type/multichoice/db/upgrade.php
+++ b/question/type/multichoice/db/upgrade.php
@@ -64,5 +64,8 @@ function xmldb_qtype_multichoice_upgrade($oldversion) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/question/type/numerical/db/upgrade.php b/question/type/numerical/db/upgrade.php
index 4d589360ada..1efb057cb26 100644
--- a/question/type/numerical/db/upgrade.php
+++ b/question/type/numerical/db/upgrade.php
@@ -44,5 +44,8 @@ function xmldb_qtype_numerical_upgrade($oldversion) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/question/type/random/db/upgrade.php b/question/type/random/db/upgrade.php
index 89131823c0f..b39ed76f967 100644
--- a/question/type/random/db/upgrade.php
+++ b/question/type/random/db/upgrade.php
@@ -43,5 +43,8 @@ function xmldb_qtype_random_upgrade($oldversion) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/question/type/randomsamatch/db/upgrade.php b/question/type/randomsamatch/db/upgrade.php
index 28ae28b50f3..484f3c423a5 100644
--- a/question/type/randomsamatch/db/upgrade.php
+++ b/question/type/randomsamatch/db/upgrade.php
@@ -43,5 +43,8 @@ function xmldb_qtype_randomsamatch_upgrade($oldversion) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/question/type/shortanswer/db/upgrade.php b/question/type/shortanswer/db/upgrade.php
index 4b7c48578db..38f6c9bcad9 100644
--- a/question/type/shortanswer/db/upgrade.php
+++ b/question/type/shortanswer/db/upgrade.php
@@ -44,5 +44,8 @@ function xmldb_qtype_shortanswer_upgrade($oldversion) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/repository/dropbox/db/upgrade.php b/repository/dropbox/db/upgrade.php
index b2418105c50..161cc43695f 100644
--- a/repository/dropbox/db/upgrade.php
+++ b/repository/dropbox/db/upgrade.php
@@ -78,5 +78,8 @@ function xmldb_repository_dropbox_upgrade($oldversion) {
         upgrade_plugin_savepoint(true, 2021052501, 'repository', 'dropbox');
     }
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/repository/flickr/db/upgrade.php b/repository/flickr/db/upgrade.php
index f4ee3da39b6..bb4bab4b919 100644
--- a/repository/flickr/db/upgrade.php
+++ b/repository/flickr/db/upgrade.php
@@ -46,5 +46,8 @@ function xmldb_repository_flickr_upgrade($oldversion) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/repository/googledocs/db/upgrade.php b/repository/googledocs/db/upgrade.php
index 946a9d98a2a..e6509199860 100644
--- a/repository/googledocs/db/upgrade.php
+++ b/repository/googledocs/db/upgrade.php
@@ -35,5 +35,8 @@ function xmldb_repository_googledocs_upgrade($oldversion) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }
diff --git a/repository/onedrive/db/upgrade.php b/repository/onedrive/db/upgrade.php
index cd80bbd4789..97b7bb32472 100644
--- a/repository/onedrive/db/upgrade.php
+++ b/repository/onedrive/db/upgrade.php
@@ -38,5 +38,8 @@ function xmldb_repository_onedrive_upgrade($oldversion) {
     // Automatically generated Moodle v3.9.0 release upgrade line.
     // Put any upgrade step following this.
 
+    // Automatically generated Moodle v4.0.0 release upgrade line.
+    // Put any upgrade step following this.
+
     return true;
 }