213 files changed, 383 insertions, 118 deletions
diff --git a/sql/base/auth_database.sql b/sql/base/auth_database.sql
index 7a01001005d..0e7c4e20ed2 100644
--- a/sql/base/auth_database.sql
+++ b/sql/base/auth_database.sql
@@ -1,8 +1,8 @@
--- MySQL dump 10.13  Distrib 8.0.32, for Linux (x86_64)
+-- MySQL dump 10.13  Distrib 8.0.33, for Linux (x86_64)
 --
 -- Host: localhost    Database: auth
 -- ------------------------------------------------------
--- Server version	8.0.32-0ubuntu0.20.04.2
+-- Server version	8.0.33-0ubuntu0.20.04.2
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -707,8 +707,8 @@ INSERT INTO `build_info` VALUES
 (48966,10,0,7,NULL,NULL,'823142CA131FBB715FF55D4343E55C6D',NULL,NULL,NULL),
 (48999,10,0,7,NULL,NULL,'79BA6FF0F9672EEF875F64155C8B62D4',NULL,NULL,NULL),
 (49267,10,0,7,NULL,NULL,'EEE77EA5A216E0731ADBB41AEFB1DF31',NULL,NULL,NULL),
-(49343,10,0,7,NULL,NULL,'301A0B4C0942B9B6F605B903AD6C1F60',NULL,NULL,NULL),
 (49318,10,1,0,NULL,NULL,'AF439AEE62EE48B36C1725111E3D9BBF',NULL,NULL,NULL),
+(49343,10,0,7,NULL,NULL,'301A0B4C0942B9B6F605B903AD6C1F60',NULL,NULL,NULL),
 (49407,10,1,0,NULL,NULL,'6413820DC9885BB0693B37090CBB2F30',NULL,NULL,NULL),
 (49426,10,1,0,NULL,NULL,'D85EDFBFE9A94A55E2B4510BE41C19B2',NULL,NULL,NULL),
 (49444,10,1,0,NULL,NULL,'363B2B05285BDD8857419D2866316D3C',NULL,NULL,NULL),
@@ -2328,7 +2328,7 @@ CREATE TABLE `realmlist` (
   `timezone` tinyint unsigned NOT NULL DEFAULT '0',
   `allowedSecurityLevel` tinyint unsigned NOT NULL DEFAULT '0',
   `population` float unsigned NOT NULL DEFAULT '0',
-  `gamebuild` int unsigned NOT NULL DEFAULT '50438',
+  `gamebuild` int unsigned NOT NULL DEFAULT '49343',
   `Region` tinyint unsigned NOT NULL DEFAULT '1',
   `Battlegroup` tinyint unsigned NOT NULL DEFAULT '1',
   PRIMARY KEY (`id`),
@@ -2695,22 +2695,23 @@ INSERT INTO `updates` VALUES
 ('2023_03_31_00_auth.sql','3F8CB31A261BCFE5C9A08B12945221CAA652AB24','ARCHIVED','2023-03-31 11:15:43',0),
 ('2023_03_31_01_auth.sql','A70E14B46537BC9208663B94EDF6CE51CB1B23BA','ARCHIVED','2023-03-31 23:16:09',0),
 ('2023_04_02_00_auth.sql','0238E0CE22D6422B19F648D026349A018CD4DB04','ARCHIVED','2023-04-02 01:02:26',0),
-('2023_04_05_00_auth.sql','67317FC9DAA66EBF68468E60F99E1F6DD5B237E8','RELEASED','2023-04-05 10:39:51',0),
-('2023_04_06_00_auth.sql','FECA06F32D077B1660D9FF8204D94F5C8E4065B4','RELEASED','2023-04-06 04:18:58',0),
-('2023_04_12_00_auth.sql','E28F892FCC2A923683E5EEE24E98C618A9534318','RELEASED','2023-04-12 00:26:10',0),
-('2023_04_25_00_auth.sql','AF297F37715F4A4C84E84182358C26CA83B0C655','RELEASED','2023-04-25 11:14:36',0),
-('2023_04_28_00_auth.sql','A686A23CE63EE116F0F100F93ABB07CD0450E937','RELEASED','2023-04-28 01:50:20',0),
-('2023_05_04_00_auth.sql','1015EC7619C1F43B9FD70C8971F883D0CBF4D002','RELEASED','2023-05-04 16:02:32',0),
-('2023_05_05_00_auth.sql','C0F435B417D238619DC390F52B27BA0E08DDE2CF','RELEASED','2023-05-05 00:55:38',0),
-('2023_05_09_00_auth.sql','E14DC7567533284034ADCD74ED99486A4AD331AE','RELEASED','2023-05-09 01:07:29',0),
-('2023_05_15_00_auth.sql','B2A9E5D5ECDC04C44136B4BAC7350AAF1522E916','RELEASED','2023-05-15 00:36:20',0),
-('2023_05_23_00_auth.sql','C58C31ABA0AF08508B1946143746C44FB6ACB824','RELEASED','2023-05-23 09:23:42',0),
-('2023_05_25_00_auth.sql','52C460A556EE08EF149E55E021AF0A9B5EC9AE13','RELEASED','2023-05-25 00:34:18',0),
-('2023_05_27_00_auth.sql','C7B7718915274FC21BAE243D42D7419F67F93792','RELEASED','2023-05-27 12:10:20',0),
-('2023_06_06_00_auth.sql','F327269C75DF6D09B3D7B33137681E0C1188120A','RELEASED','2023-06-06 00:50:17',0),
-('2023_06_12_00_auth.sql','5BEE858205C3EDE75C5A5A1E46FBEE2257F97B83','RELEASED','2023-06-12 23:47:51',0),
-('2023_07_12_00_auth.sql','E610FC5F0B1079070F69B5AAA6D6BDA5630B081F','RELEASED','2023-07-12 11:21:50',0),
-('2023_07_13_00_auth.sql','BF718B6F8F2A324092D95BC1370120F0EE699BD2','RELEASED','2023-07-13 19:53:43',0);
+('2023_04_05_00_auth.sql','67317FC9DAA66EBF68468E60F99E1F6DD5B237E8','ARCHIVED','2023-04-05 10:39:51',0),
+('2023_04_06_00_auth.sql','FECA06F32D077B1660D9FF8204D94F5C8E4065B4','ARCHIVED','2023-04-06 04:18:58',0),
+('2023_04_12_00_auth.sql','E28F892FCC2A923683E5EEE24E98C618A9534318','ARCHIVED','2023-04-12 00:26:10',0),
+('2023_04_25_00_auth.sql','AF297F37715F4A4C84E84182358C26CA83B0C655','ARCHIVED','2023-04-25 11:14:36',0),
+('2023_04_28_00_auth.sql','779248686CB60F21CA7E9514E33B2D3E37C91B9E','ARCHIVED','2023-07-14 08:19:57',0),
+('2023_05_04_00_auth.sql','1015EC7619C1F43B9FD70C8971F883D0CBF4D002','ARCHIVED','2023-05-04 16:02:32',0),
+('2023_05_05_00_auth.sql','C0F435B417D238619DC390F52B27BA0E08DDE2CF','ARCHIVED','2023-05-05 00:55:38',0),
+('2023_05_09_00_auth.sql','E14DC7567533284034ADCD74ED99486A4AD331AE','ARCHIVED','2023-05-09 01:07:29',0),
+('2023_05_15_00_auth.sql','B2A9E5D5ECDC04C44136B4BAC7350AAF1522E916','ARCHIVED','2023-05-15 00:36:20',0),
+('2023_05_23_00_auth.sql','C58C31ABA0AF08508B1946143746C44FB6ACB824','ARCHIVED','2023-05-23 09:23:42',0),
+('2023_05_25_00_auth.sql','52C460A556EE08EF149E55E021AF0A9B5EC9AE13','ARCHIVED','2023-05-25 00:34:18',0),
+('2023_05_27_00_auth.sql','C7B7718915274FC21BAE243D42D7419F67F93792','ARCHIVED','2023-05-27 12:10:20',0),
+('2023_06_06_00_auth.sql','F327269C75DF6D09B3D7B33137681E0C1188120A','ARCHIVED','2023-06-06 00:50:17',0),
+('2023_06_12_00_auth.sql','5BEE858205C3EDE75C5A5A1E46FBEE2257F97B83','ARCHIVED','2023-06-12 23:47:51',0),
+('2023_07_12_00_auth.sql','E610FC5F0B1079070F69B5AAA6D6BDA5630B081F','ARCHIVED','2023-07-12 11:21:50',0),
+('2023_07_13_00_auth.sql','BF718B6F8F2A324092D95BC1370120F0EE699BD2','ARCHIVED','2023-07-13 19:53:43',0),
+('2023_07_14_00_auth.sql','B66CDB7EE7E554992BB2A9DAB3C16122411C81DF','ARCHIVED','2023-07-14 08:24:44',0);
 /*!40000 ALTER TABLE `updates` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -2853,4 +2854,4 @@ SET character_set_client = @saved_cs_client;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2023-04-02  1:02:28
+-- Dump completed on 2023-07-14  8:24:46
diff --git a/sql/base/characters_database.sql b/sql/base/characters_database.sql
index a5eb4f7a664..d72e85fffc7 100644
--- a/sql/base/characters_database.sql
+++ b/sql/base/characters_database.sql
@@ -1,8 +1,8 @@
--- MySQL dump 10.13  Distrib 8.0.32, for Linux (x86_64)
+-- MySQL dump 10.13  Distrib 8.0.33, for Linux (x86_64)
 --
 -- Host: localhost    Database: characters
 -- ------------------------------------------------------
--- Server version	8.0.32-0ubuntu0.20.04.2
+-- Server version	8.0.33-0ubuntu0.20.04.2
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -3706,8 +3706,9 @@ INSERT INTO `updates` VALUES
 ('2023_02_03_00_characters.sql','A04BA4386B3D5C60407D22CA4BF9A4A6258AA39D','ARCHIVED','2023-02-03 01:13:52',0),
 ('2023_02_08_00_characters.sql','C9DF607CCE99540F613F5E25E17090176C995C7C','ARCHIVED','2023-02-08 21:41:17',0),
 ('2023_04_02_00_characters.sql','AAC1B81AFE4716CF4DAB6BCF01D22F421BFAD253','ARCHIVED','2023-04-02 01:02:26',0),
-('2023_05_04_00_characters.sql','9AC370E51507F5BD368707E90D8F6BF0FF16CA09','RELEASED','2023-05-04 16:17:31',0),
-('2023_05_19_00_characters.sql','5E0C9338554BAA481566EDFF3FE2FCEFF1B67DA9','RELEASED','2023-05-19 18:40:42',0);
+('2023_05_04_00_characters.sql','9AC370E51507F5BD368707E90D8F6BF0FF16CA09','ARCHIVED','2023-05-04 16:17:31',0),
+('2023_05_19_00_characters.sql','5E0C9338554BAA481566EDFF3FE2FCEFF1B67DA9','ARCHIVED','2023-05-19 18:40:42',0),
+('2023_07_14_00_characters.sql','BB44A95A9C4B0C16878A5316AC38E702A8AACDE2','ARCHIVED','2023-07-14 08:24:44',0);
 /*!40000 ALTER TABLE `updates` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -3834,4 +3835,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2023-04-02  1:02:28
+-- Dump completed on 2023-07-14  8:24:47
diff --git a/sql/base/dev/hotfixes_database.sql b/sql/base/dev/hotfixes_database.sql
index 1db012d7a3e..d7a7b72b335 100644
--- a/sql/base/dev/hotfixes_database.sql
+++ b/sql/base/dev/hotfixes_database.sql
@@ -1,8 +1,8 @@
--- MySQL dump 10.13  Distrib 8.0.32, for Linux (x86_64)
+-- MySQL dump 10.13  Distrib 8.0.33, for Linux (x86_64)
 --
 -- Host: localhost    Database: hotfixes
 -- ------------------------------------------------------
--- Server version	8.0.32-0ubuntu0.20.04.2
+-- Server version	8.0.33-0ubuntu0.20.04.2
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -318,7 +318,7 @@ CREATE TABLE `area_table` (
   `UwIntroSound` int unsigned NOT NULL DEFAULT '0',
   `FactionGroupMask` tinyint unsigned NOT NULL DEFAULT '0',
   `AmbientMultiplier` float NOT NULL DEFAULT '0',
-  `MountFlags` tinyint unsigned NOT NULL DEFAULT '0',
+  `MountFlags` int NOT NULL DEFAULT '0',
   `PvpCombatWorldStateID` smallint NOT NULL DEFAULT '0',
   `WildBattlePetLevelMin` tinyint unsigned NOT NULL DEFAULT '0',
   `WildBattlePetLevelMax` tinyint unsigned NOT NULL DEFAULT '0',
@@ -1110,6 +1110,55 @@ CREATE TABLE `barber_shop_style_locale` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `battle_pet_ability`
+--
+
+DROP TABLE IF EXISTS `battle_pet_ability`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `battle_pet_ability` (
+  `ID` int unsigned NOT NULL DEFAULT '0',
+  `Name` text COLLATE utf8mb4_unicode_ci,
+  `Description` text COLLATE utf8mb4_unicode_ci,
+  `IconFileDataID` int NOT NULL DEFAULT '0',
+  `PetTypeEnum` tinyint NOT NULL DEFAULT '0',
+  `Cooldown` int unsigned NOT NULL DEFAULT '0',
+  `BattlePetVisualID` smallint unsigned NOT NULL DEFAULT '0',
+  `Flags` tinyint unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` int NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`,`VerifiedBuild`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `battle_pet_ability_locale`
+--
+
+DROP TABLE IF EXISTS `battle_pet_ability_locale`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `battle_pet_ability_locale` (
+  `ID` int unsigned NOT NULL DEFAULT '0',
+  `locale` varchar(4) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `Name_lang` text COLLATE utf8mb4_unicode_ci,
+  `Description_lang` text COLLATE utf8mb4_unicode_ci,
+  `VerifiedBuild` int NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`,`locale`,`VerifiedBuild`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci
+/*!50500 PARTITION BY LIST  COLUMNS(locale)
+(PARTITION deDE VALUES IN ('deDE') ENGINE = InnoDB,
+ PARTITION esES VALUES IN ('esES') ENGINE = InnoDB,
+ PARTITION esMX VALUES IN ('esMX') ENGINE = InnoDB,
+ PARTITION frFR VALUES IN ('frFR') ENGINE = InnoDB,
+ PARTITION itIT VALUES IN ('itIT') ENGINE = InnoDB,
+ PARTITION koKR VALUES IN ('koKR') ENGINE = InnoDB,
+ PARTITION ptBR VALUES IN ('ptBR') ENGINE = InnoDB,
+ PARTITION ruRU VALUES IN ('ruRU') ENGINE = InnoDB,
+ PARTITION zhCN VALUES IN ('zhCN') ENGINE = InnoDB,
+ PARTITION zhTW VALUES IN ('zhTW') ENGINE = InnoDB) */;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `battle_pet_breed_quality`
 --
 
@@ -1384,6 +1433,27 @@ CREATE TABLE `cfg_regions` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `challenge_mode_item_bonus_override`
+--
+
+DROP TABLE IF EXISTS `challenge_mode_item_bonus_override`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `challenge_mode_item_bonus_override` (
+  `ID` int unsigned NOT NULL DEFAULT '0',
+  `ItemBonusTreeGroupID` int NOT NULL DEFAULT '0',
+  `DstItemBonusTreeID` int NOT NULL DEFAULT '0',
+  `Type` tinyint NOT NULL DEFAULT '0',
+  `Value` int NOT NULL DEFAULT '0',
+  `MythicPlusSeasonID` int NOT NULL DEFAULT '0',
+  `PvPSeasonID` int NOT NULL DEFAULT '0',
+  `SrcItemBonusTreeID` int unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` int NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`,`VerifiedBuild`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `char_titles`
 --
 
@@ -1646,6 +1716,7 @@ CREATE TABLE `chr_customization_choice` (
   `UiOrderIndex` smallint unsigned NOT NULL DEFAULT '0',
   `Flags` int NOT NULL DEFAULT '0',
   `AddedInPatch` int NOT NULL DEFAULT '0',
+  `SoundKitID` int NOT NULL DEFAULT '0',
   `SwatchColor1` int NOT NULL DEFAULT '0',
   `SwatchColor2` int NOT NULL DEFAULT '0',
   `VerifiedBuild` int NOT NULL DEFAULT '0',
@@ -1717,6 +1788,7 @@ CREATE TABLE `chr_customization_element` (
   `ChrCustomizationDisplayInfoID` int NOT NULL DEFAULT '0',
   `ChrCustItemGeoModifyID` int NOT NULL DEFAULT '0',
   `ChrCustomizationVoiceID` int NOT NULL DEFAULT '0',
+  `AnimKitID` int NOT NULL DEFAULT '0',
   `VerifiedBuild` int NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`,`VerifiedBuild`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
@@ -1784,6 +1856,7 @@ DROP TABLE IF EXISTS `chr_customization_req`;
 /*!50503 SET character_set_client = utf8mb4 */;
 CREATE TABLE `chr_customization_req` (
   `ID` int unsigned NOT NULL DEFAULT '0',
+  `RaceMask` bigint NOT NULL DEFAULT '0',
   `ReqSource` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `Flags` int NOT NULL DEFAULT '0',
   `ClassMask` int NOT NULL DEFAULT '0',
@@ -2107,6 +2180,43 @@ CREATE TABLE `cinematic_sequences` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `conditional_chr_model`
+--
+
+DROP TABLE IF EXISTS `conditional_chr_model`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `conditional_chr_model` (
+  `ID` int NOT NULL DEFAULT '0',
+  `ChrModelID` int unsigned NOT NULL DEFAULT '0',
+  `ChrCustomizationReqID` int NOT NULL DEFAULT '0',
+  `PlayerConditionID` int NOT NULL DEFAULT '0',
+  `Flags` int NOT NULL DEFAULT '0',
+  `ChrCustomizationCategoryID` int NOT NULL DEFAULT '0',
+  `VerifiedBuild` int NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`,`VerifiedBuild`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `conditional_content_tuning`
+--
+
+DROP TABLE IF EXISTS `conditional_content_tuning`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `conditional_content_tuning` (
+  `ID` int unsigned NOT NULL DEFAULT '0',
+  `OrderIndex` int NOT NULL DEFAULT '0',
+  `RedirectContentTuningID` int NOT NULL DEFAULT '0',
+  `RedirectFlag` int NOT NULL DEFAULT '0',
+  `ParentContentTuningID` int unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` int NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`,`VerifiedBuild`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `content_tuning`
 --
 
@@ -2126,6 +2236,7 @@ CREATE TABLE `content_tuning` (
   `TargetLevelMin` int NOT NULL DEFAULT '0',
   `TargetLevelMax` int NOT NULL DEFAULT '0',
   `MinItemLevel` int NOT NULL DEFAULT '0',
+  `QuestXpMultiplier` float NOT NULL DEFAULT '0',
   `VerifiedBuild` int NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`,`VerifiedBuild`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
@@ -2150,6 +2261,22 @@ CREATE TABLE `content_tuning_x_expected` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `content_tuning_x_label`
+--
+
+DROP TABLE IF EXISTS `content_tuning_x_label`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `content_tuning_x_label` (
+  `ID` int unsigned NOT NULL DEFAULT '0',
+  `LabelID` int NOT NULL DEFAULT '0',
+  `ContentTuningID` int unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` int NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`,`VerifiedBuild`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `conversation_line`
 --
 
@@ -2467,12 +2594,12 @@ CREATE TABLE `criteria` (
   `Type` smallint NOT NULL DEFAULT '0',
   `Asset` int NOT NULL DEFAULT '0',
   `ModifierTreeId` int unsigned NOT NULL DEFAULT '0',
-  `StartEvent` tinyint unsigned NOT NULL DEFAULT '0',
+  `StartEvent` int NOT NULL DEFAULT '0',
   `StartAsset` int NOT NULL DEFAULT '0',
   `StartTimer` smallint unsigned NOT NULL DEFAULT '0',
-  `FailEvent` tinyint unsigned NOT NULL DEFAULT '0',
+  `FailEvent` int NOT NULL DEFAULT '0',
   `FailAsset` int NOT NULL DEFAULT '0',
-  `Flags` tinyint unsigned NOT NULL DEFAULT '0',
+  `Flags` int NOT NULL DEFAULT '0',
   `EligibilityWorldStateID` smallint NOT NULL DEFAULT '0',
   `EligibilityWorldStateValue` tinyint NOT NULL DEFAULT '0',
   `VerifiedBuild` int NOT NULL DEFAULT '0',
@@ -2492,7 +2619,7 @@ CREATE TABLE `criteria_tree` (
   `Description` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `Parent` int unsigned NOT NULL DEFAULT '0',
   `Amount` int unsigned NOT NULL DEFAULT '0',
-  `Operator` tinyint NOT NULL DEFAULT '0',
+  `Operator` int NOT NULL DEFAULT '0',
   `CriteriaID` int unsigned NOT NULL DEFAULT '0',
   `OrderIndex` int NOT NULL DEFAULT '0',
   `Flags` int NOT NULL DEFAULT '0',
@@ -2667,7 +2794,7 @@ CREATE TABLE `curve_point` (
   `PreSLSquishPosX` float NOT NULL DEFAULT '0',
   `PreSLSquishPosY` float NOT NULL DEFAULT '0',
   `ID` int unsigned NOT NULL DEFAULT '0',
-  `CurveID` smallint unsigned NOT NULL DEFAULT '0',
+  `CurveID` int NOT NULL DEFAULT '0',
   `OrderIndex` tinyint unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` int NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`,`VerifiedBuild`)
@@ -3220,6 +3347,9 @@ CREATE TABLE `gameobject_display_info` (
   `ObjectEffectPackageID` smallint NOT NULL DEFAULT '0',
   `OverrideLootEffectScale` float NOT NULL DEFAULT '0',
   `OverrideNameScale` float NOT NULL DEFAULT '0',
+  `AlternateDisplayType` int NOT NULL DEFAULT '0',
+  `ClientCreatureDisplayInfoID` int NOT NULL DEFAULT '0',
+  `ClientItemID` int NOT NULL DEFAULT '0',
   `VerifiedBuild` int NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`,`VerifiedBuild`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
@@ -4387,6 +4517,28 @@ CREATE TABLE `item_bonus` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `item_bonus_list_group_entry`
+--
+
+DROP TABLE IF EXISTS `item_bonus_list_group_entry`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `item_bonus_list_group_entry` (
+  `ID` int unsigned NOT NULL DEFAULT '0',
+  `ItemBonusListGroupID` int NOT NULL DEFAULT '0',
+  `ItemBonusListID` int NOT NULL DEFAULT '0',
+  `ItemLevelSelectorID` int NOT NULL DEFAULT '0',
+  `SequenceValue` int NOT NULL DEFAULT '0',
+  `ItemExtendedCostID` int NOT NULL DEFAULT '0',
+  `PlayerConditionID` int NOT NULL DEFAULT '0',
+  `Flags` int NOT NULL DEFAULT '0',
+  `ItemLogicalCostGroupID` int NOT NULL DEFAULT '0',
+  `VerifiedBuild` int NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`,`VerifiedBuild`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `item_bonus_list_level_delta`
 --
 
@@ -4402,6 +4554,22 @@ CREATE TABLE `item_bonus_list_level_delta` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `item_bonus_tree`
+--
+
+DROP TABLE IF EXISTS `item_bonus_tree`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `item_bonus_tree` (
+  `ID` int unsigned NOT NULL DEFAULT '0',
+  `Flags` int NOT NULL DEFAULT '0',
+  `InventoryTypeSlotMask` int NOT NULL DEFAULT '0',
+  `VerifiedBuild` int NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`,`VerifiedBuild`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `item_bonus_tree_node`
 --
 
@@ -4416,6 +4584,8 @@ CREATE TABLE `item_bonus_tree_node` (
   `ChildItemLevelSelectorID` smallint unsigned NOT NULL DEFAULT '0',
   `ChildItemBonusListGroupID` int NOT NULL DEFAULT '0',
   `IblGroupPointsModSetID` int NOT NULL DEFAULT '0',
+  `MinMythicPlusLevel` int NOT NULL DEFAULT '0',
+  `MaxMythicPlusLevel` int NOT NULL DEFAULT '0',
   `ParentItemBonusTreeID` int unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` int NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`,`VerifiedBuild`)
@@ -4485,6 +4655,27 @@ CREATE TABLE `item_class_locale` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `item_context_picker_entry`
+--
+
+DROP TABLE IF EXISTS `item_context_picker_entry`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `item_context_picker_entry` (
+  `ID` int unsigned NOT NULL DEFAULT '0',
+  `ItemCreationContext` tinyint unsigned NOT NULL DEFAULT '0',
+  `OrderIndex` tinyint unsigned NOT NULL DEFAULT '0',
+  `PVal` int NOT NULL DEFAULT '0',
+  `LabelID` int NOT NULL DEFAULT '0',
+  `Flags` int unsigned NOT NULL DEFAULT '0',
+  `PlayerConditionID` int unsigned NOT NULL DEFAULT '0',
+  `ItemContextPickerID` int unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` int NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`,`VerifiedBuild`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `item_currency_cost`
 --
 
@@ -6243,6 +6434,24 @@ CREATE TABLE `movie` (
   `KeyID` tinyint unsigned NOT NULL DEFAULT '0',
   `AudioFileDataID` int unsigned NOT NULL DEFAULT '0',
   `SubtitleFileDataID` int unsigned NOT NULL DEFAULT '0',
+  `SubtitleFileFormat` int NOT NULL DEFAULT '0',
+  `VerifiedBuild` int NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`,`VerifiedBuild`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `mythic_plus_season`
+--
+
+DROP TABLE IF EXISTS `mythic_plus_season`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `mythic_plus_season` (
+  `ID` int unsigned NOT NULL DEFAULT '0',
+  `MilestoneSeason` int NOT NULL DEFAULT '0',
+  `ExpansionLevel` int NOT NULL DEFAULT '0',
+  `HeroicLFGDungeonMinGear` int NOT NULL DEFAULT '0',
   `VerifiedBuild` int NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`,`VerifiedBuild`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
@@ -6729,6 +6938,23 @@ CREATE TABLE `pvp_item` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `pvp_season`
+--
+
+DROP TABLE IF EXISTS `pvp_season`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `pvp_season` (
+  `ID` int unsigned NOT NULL DEFAULT '0',
+  `MilestoneSeason` int NOT NULL DEFAULT '0',
+  `AllianceAchievementID` int NOT NULL DEFAULT '0',
+  `HordeAchievementID` int NOT NULL DEFAULT '0',
+  `VerifiedBuild` int NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`,`VerifiedBuild`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `pvp_talent`
 --
 
@@ -7723,7 +7949,7 @@ DROP TABLE IF EXISTS `spell_category`;
 CREATE TABLE `spell_category` (
   `ID` int unsigned NOT NULL DEFAULT '0',
   `Name` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
-  `Flags` tinyint NOT NULL DEFAULT '0',
+  `Flags` int NOT NULL DEFAULT '0',
   `UsesPerWeek` tinyint unsigned NOT NULL DEFAULT '0',
   `MaxCharges` tinyint NOT NULL DEFAULT '0',
   `ChargeRecoveryTime` int NOT NULL DEFAULT '0',
@@ -8073,7 +8299,7 @@ DROP TABLE IF EXISTS `spell_keybound_override`;
 /*!50503 SET character_set_client = utf8mb4 */;
 CREATE TABLE `spell_keybound_override` (
   `ID` int unsigned NOT NULL DEFAULT '0',
-  `Function` text COLLATE utf8mb4_unicode_ci,
+  `Function` text CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `Type` tinyint NOT NULL DEFAULT '0',
   `Data` int NOT NULL DEFAULT '0',
   `Flags` int NOT NULL DEFAULT '0',
@@ -9671,10 +9897,11 @@ CREATE TABLE `ui_map` (
   `ID` int unsigned NOT NULL DEFAULT '0',
   `ParentUiMapID` int NOT NULL DEFAULT '0',
   `Flags` int NOT NULL DEFAULT '0',
-  `System` int unsigned NOT NULL DEFAULT '0',
-  `Type` int unsigned NOT NULL DEFAULT '0',
+  `System` tinyint unsigned NOT NULL DEFAULT '0',
+  `Type` tinyint unsigned NOT NULL DEFAULT '0',
   `BountySetID` int NOT NULL DEFAULT '0',
   `BountyDisplayLocation` int unsigned NOT NULL DEFAULT '0',
+  `VisibilityPlayerConditionID2` int NOT NULL DEFAULT '0',
   `VisibilityPlayerConditionID` int NOT NULL DEFAULT '0',
   `HelpTextPosition` tinyint NOT NULL DEFAULT '0',
   `BkgAtlasID` int NOT NULL DEFAULT '0',
@@ -9996,7 +10223,7 @@ DROP TABLE IF EXISTS `vehicle`;
 CREATE TABLE `vehicle` (
   `ID` int unsigned NOT NULL DEFAULT '0',
   `Flags` int NOT NULL DEFAULT '0',
-  `FlagsB` tinyint unsigned NOT NULL DEFAULT '0',
+  `FlagsB` int NOT NULL DEFAULT '0',
   `TurnSpeed` float NOT NULL DEFAULT '0',
   `PitchSpeed` float NOT NULL DEFAULT '0',
   `PitchMin` float NOT NULL DEFAULT '0',
@@ -10238,4 +10465,4 @@ CREATE TABLE `world_state_expression` (
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2023-04-02  1:02:34
+-- Dump completed on 2023-07-14  8:24:54
diff --git a/sql/base/dev/world_database.sql b/sql/base/dev/world_database.sql
index e98242646cd..ceba3d852c7 100644
--- a/sql/base/dev/world_database.sql
+++ b/sql/base/dev/world_database.sql
@@ -1,8 +1,8 @@
--- MySQL dump 10.13  Distrib 8.0.32, for Linux (x86_64)
+-- MySQL dump 10.13  Distrib 8.0.33, for Linux (x86_64)
 --
 -- Host: localhost    Database: world
 -- ------------------------------------------------------
--- Server version	8.0.32-0ubuntu0.20.04.2
+-- Server version	8.0.33-0ubuntu0.20.04.2
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -550,6 +550,7 @@ CREATE TABLE `conversation_line_template` (
   `UiCameraID` int unsigned NOT NULL DEFAULT '0',
   `ActorIdx` tinyint unsigned NOT NULL DEFAULT '0',
   `Flags` tinyint unsigned NOT NULL DEFAULT '0',
+  `ChatType` tinyint unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` int unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`Id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
@@ -606,7 +607,6 @@ CREATE TABLE `creature` (
   `unit_flags` int unsigned NOT NULL DEFAULT '0',
   `unit_flags2` int unsigned NOT NULL DEFAULT '0',
   `unit_flags3` int unsigned NOT NULL DEFAULT '0',
-  `dynamicflags` int unsigned NOT NULL DEFAULT '0',
   `ScriptName` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
   `StringId` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
   `VerifiedBuild` int NOT NULL DEFAULT '0',
@@ -824,10 +824,11 @@ DROP TABLE IF EXISTS `creature_questitem`;
 /*!50503 SET character_set_client = utf8mb4 */;
 CREATE TABLE `creature_questitem` (
   `CreatureEntry` int unsigned NOT NULL DEFAULT '0',
+  `DifficultyID` tinyint unsigned NOT NULL DEFAULT '0',
   `Idx` int unsigned NOT NULL DEFAULT '0',
   `ItemId` int unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` int NOT NULL DEFAULT '0',
-  PRIMARY KEY (`CreatureEntry`,`Idx`)
+  PRIMARY KEY (`CreatureEntry`,`DifficultyID`,`Idx`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -893,9 +894,6 @@ DROP TABLE IF EXISTS `creature_template`;
 /*!50503 SET character_set_client = utf8mb4 */;
 CREATE TABLE `creature_template` (
   `entry` int unsigned NOT NULL DEFAULT '0',
-  `difficulty_entry_1` int unsigned NOT NULL DEFAULT '0',
-  `difficulty_entry_2` int unsigned NOT NULL DEFAULT '0',
-  `difficulty_entry_3` int unsigned NOT NULL DEFAULT '0',
   `KillCredit1` int unsigned NOT NULL DEFAULT '0',
   `KillCredit2` int unsigned NOT NULL DEFAULT '0',
   `name` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
@@ -903,8 +901,6 @@ CREATE TABLE `creature_template` (
   `subname` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `TitleAlt` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   `IconName` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci DEFAULT NULL,
-  `gossip_menu_id` int unsigned NOT NULL DEFAULT '0',
-  `HealthScalingExpansion` int NOT NULL DEFAULT '0',
   `RequiredExpansion` int NOT NULL DEFAULT '0',
   `VignetteID` int NOT NULL DEFAULT '0',
   `faction` smallint unsigned NOT NULL DEFAULT '0',
@@ -922,31 +918,15 @@ CREATE TABLE `creature_template` (
   `unit_flags` int unsigned NOT NULL DEFAULT '0',
   `unit_flags2` int unsigned NOT NULL DEFAULT '0',
   `unit_flags3` int unsigned NOT NULL DEFAULT '0',
-  `dynamicflags` int unsigned NOT NULL DEFAULT '0',
   `family` int NOT NULL DEFAULT '0',
   `trainer_class` tinyint unsigned NOT NULL DEFAULT '0',
   `type` tinyint unsigned NOT NULL DEFAULT '0',
-  `type_flags` int unsigned NOT NULL DEFAULT '0',
-  `type_flags2` int unsigned NOT NULL DEFAULT '0',
-  `lootid` int unsigned NOT NULL DEFAULT '0',
-  `pickpocketloot` int unsigned NOT NULL DEFAULT '0',
-  `skinloot` int unsigned NOT NULL DEFAULT '0',
   `VehicleId` int unsigned NOT NULL DEFAULT '0',
-  `mingold` int unsigned NOT NULL DEFAULT '0',
-  `maxgold` int unsigned NOT NULL DEFAULT '0',
   `AIName` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
   `MovementType` tinyint unsigned NOT NULL DEFAULT '0',
-  `HoverHeight` float NOT NULL DEFAULT '1',
-  `HealthModifier` float NOT NULL DEFAULT '1',
-  `HealthModifierExtra` float NOT NULL DEFAULT '1',
-  `ManaModifier` float NOT NULL DEFAULT '1',
-  `ManaModifierExtra` float NOT NULL DEFAULT '1',
-  `ArmorModifier` float NOT NULL DEFAULT '1',
-  `DamageModifier` float NOT NULL DEFAULT '1',
   `ExperienceModifier` float NOT NULL DEFAULT '1',
   `RacialLeader` tinyint unsigned NOT NULL DEFAULT '0',
   `movementId` int unsigned NOT NULL DEFAULT '0',
-  `CreatureDifficultyID` int NOT NULL DEFAULT '0',
   `WidgetSetID` int NOT NULL DEFAULT '0',
   `WidgetSetUnitConditionID` int NOT NULL DEFAULT '0',
   `RegenHealth` tinyint unsigned NOT NULL DEFAULT '1',
@@ -988,6 +968,60 @@ CREATE TABLE `creature_template_addon` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `creature_template_difficulty`
+--
+
+DROP TABLE IF EXISTS `creature_template_difficulty`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `creature_template_difficulty` (
+  `Entry` int unsigned NOT NULL,
+  `DifficultyID` tinyint unsigned NOT NULL DEFAULT '0',
+  `LevelScalingDeltaMin` smallint NOT NULL DEFAULT '0',
+  `LevelScalingDeltaMax` smallint NOT NULL DEFAULT '0',
+  `ContentTuningID` int NOT NULL DEFAULT '0',
+  `HealthScalingExpansion` int NOT NULL DEFAULT '0',
+  `HealthModifier` float NOT NULL DEFAULT '1',
+  `ManaModifier` float NOT NULL DEFAULT '1',
+  `ArmorModifier` float NOT NULL DEFAULT '1',
+  `DamageModifier` float NOT NULL DEFAULT '1',
+  `CreatureDifficultyID` int NOT NULL DEFAULT '0',
+  `TypeFlags` int unsigned NOT NULL DEFAULT '0',
+  `TypeFlags2` int unsigned NOT NULL DEFAULT '0',
+  `LootID` int unsigned NOT NULL DEFAULT '0',
+  `PickPocketLootID` int unsigned NOT NULL DEFAULT '0',
+  `SkinLootID` int unsigned NOT NULL DEFAULT '0',
+  `GoldMin` int unsigned NOT NULL DEFAULT '0',
+  `GoldMax` int unsigned NOT NULL DEFAULT '0',
+  `StaticFlags1` int unsigned NOT NULL DEFAULT '0',
+  `StaticFlags2` int unsigned NOT NULL DEFAULT '0',
+  `StaticFlags3` int unsigned NOT NULL DEFAULT '0',
+  `StaticFlags4` int unsigned NOT NULL DEFAULT '0',
+  `StaticFlags5` int unsigned NOT NULL DEFAULT '0',
+  `StaticFlags6` int unsigned NOT NULL DEFAULT '0',
+  `StaticFlags7` int unsigned NOT NULL DEFAULT '0',
+  `StaticFlags8` int unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` int NOT NULL DEFAULT '0',
+  PRIMARY KEY (`Entry`,`DifficultyID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `creature_template_gossip`
+--
+
+DROP TABLE IF EXISTS `creature_template_gossip`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `creature_template_gossip` (
+  `CreatureID` int unsigned NOT NULL,
+  `MenuID` int unsigned NOT NULL,
+  `VerifiedBuild` int NOT NULL DEFAULT '0',
+  PRIMARY KEY (`CreatureID`,`MenuID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `creature_template_locale`
 --
 
@@ -1061,21 +1095,17 @@ CREATE TABLE `creature_template_resistance` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
--- Table structure for table `creature_template_scaling`
+-- Table structure for table `creature_template_sparring`
 --
 
-DROP TABLE IF EXISTS `creature_template_scaling`;
+DROP TABLE IF EXISTS `creature_template_sparring`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!50503 SET character_set_client = utf8mb4 */;
-CREATE TABLE `creature_template_scaling` (
+CREATE TABLE `creature_template_sparring` (
   `Entry` int unsigned NOT NULL,
-  `DifficultyID` tinyint unsigned NOT NULL DEFAULT '0',
-  `LevelScalingDeltaMin` smallint NOT NULL DEFAULT '0',
-  `LevelScalingDeltaMax` smallint NOT NULL DEFAULT '0',
-  `ContentTuningID` int NOT NULL DEFAULT '0',
-  `VerifiedBuild` int NOT NULL DEFAULT '0',
-  PRIMARY KEY (`Entry`,`DifficultyID`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+  `NoNPCDamageBelowHealthPct` float NOT NULL,
+  PRIMARY KEY (`Entry`,`NoNPCDamageBelowHealthPct`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1211,6 +1241,20 @@ CREATE TABLE `disenchant_loot_template` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `event_script_names`
+--
+
+DROP TABLE IF EXISTS `event_script_names`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `event_script_names` (
+  `Id` int unsigned NOT NULL,
+  `ScriptName` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL,
+  PRIMARY KEY (`Id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `event_scripts`
 --
 
@@ -1524,7 +1568,7 @@ CREATE TABLE `game_tele` (
   `map` smallint unsigned NOT NULL DEFAULT '0',
   `name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '',
   PRIMARY KEY (`id`)
-) ENGINE=InnoDB AUTO_INCREMENT=1965 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Tele Command';
+) ENGINE=InnoDB AUTO_INCREMENT=1967 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Tele Command';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1920,7 +1964,6 @@ DROP TABLE IF EXISTS `graveyard_zone`;
 CREATE TABLE `graveyard_zone` (
   `ID` int unsigned NOT NULL DEFAULT '0',
   `GhostZone` int unsigned NOT NULL DEFAULT '0',
-  `Faction` smallint unsigned NOT NULL DEFAULT '0',
   `Comment` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
   PRIMARY KEY (`ID`,`GhostZone`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Trigger System';
@@ -3079,6 +3122,24 @@ CREATE TABLE `quest_objectives` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `quest_objectives_completion_effect`
+--
+
+DROP TABLE IF EXISTS `quest_objectives_completion_effect`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!50503 SET character_set_client = utf8mb4 */;
+CREATE TABLE `quest_objectives_completion_effect` (
+  `ObjectiveID` int NOT NULL,
+  `GameEventID` int DEFAULT NULL,
+  `SpellID` int DEFAULT NULL,
+  `ConversationID` int DEFAULT NULL,
+  `UpdatePhaseShift` tinyint(1) DEFAULT '0',
+  `UpdateZoneAuras` tinyint(1) DEFAULT '0',
+  PRIMARY KEY (`ObjectiveID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `quest_objectives_locale`
 --
 
@@ -3320,6 +3381,7 @@ CREATE TABLE `quest_reward_display_spell` (
   `Idx` int unsigned NOT NULL,
   `SpellID` int unsigned DEFAULT '0',
   `PlayerConditionID` int unsigned DEFAULT '0',
+  `Type` int unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` int NOT NULL DEFAULT '0',
   PRIMARY KEY (`QuestID`,`Idx`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
@@ -3437,7 +3499,7 @@ CREATE TABLE `quest_template` (
   `AcceptedSoundKitID` int unsigned NOT NULL DEFAULT '0',
   `CompleteSoundKitID` int unsigned NOT NULL DEFAULT '0',
   `AreaGroupID` int unsigned NOT NULL DEFAULT '0',
-  `TimeAllowed` int unsigned NOT NULL DEFAULT '0',
+  `TimeAllowed` bigint NOT NULL DEFAULT '0',
   `AllowableRaces` bigint unsigned DEFAULT '0',
   `TreasurePickerID` int NOT NULL DEFAULT '0',
   `Expansion` int NOT NULL DEFAULT '0',
@@ -3728,25 +3790,6 @@ CREATE TABLE `script_spline_chain_waypoints` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
--- Table structure for table `script_waypoint`
---
-
-DROP TABLE IF EXISTS `script_waypoint`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!50503 SET character_set_client = utf8mb4 */;
-CREATE TABLE `script_waypoint` (
-  `entry` int unsigned NOT NULL DEFAULT '0' COMMENT 'creature_template entry',
-  `pointid` int unsigned NOT NULL DEFAULT '0',
-  `location_x` float NOT NULL DEFAULT '0',
-  `location_y` float NOT NULL DEFAULT '0',
-  `location_z` float NOT NULL DEFAULT '0',
-  `waittime` int unsigned NOT NULL DEFAULT '0' COMMENT 'waittime in millisecs',
-  `point_comment` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
-  PRIMARY KEY (`entry`,`pointid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Script Creature waypoints';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
 -- Table structure for table `serverside_spell`
 --
 
@@ -4749,26 +4792,6 @@ CREATE TABLE `waypoint_scripts` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
--- Table structure for table `waypoints`
---
-
-DROP TABLE IF EXISTS `waypoints`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!50503 SET character_set_client = utf8mb4 */;
-CREATE TABLE `waypoints` (
-  `entry` int unsigned NOT NULL DEFAULT '0',
-  `pointid` int unsigned NOT NULL DEFAULT '0',
-  `position_x` float NOT NULL DEFAULT '0',
-  `position_y` float NOT NULL DEFAULT '0',
-  `position_z` float NOT NULL DEFAULT '0',
-  `orientation` float DEFAULT NULL,
-  `delay` int unsigned NOT NULL DEFAULT '0',
-  `point_comment` mediumtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci,
-  PRIMARY KEY (`entry`,`pointid`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='Creature waypoints';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
 -- Table structure for table `world_safe_locs`
 --
 
@@ -4872,4 +4895,4 @@ CREATE TABLE `world_state` (
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2023-04-02  1:02:30
+-- Dump completed on 2023-07-14  8:24:49
diff --git a/sql/updates/auth/master/2023_04_02_00_auth.sql b/sql/old/10.x/auth/23041_2023_07_14/2023_04_02_00_auth.sql
index 80ea98771a4..80ea98771a4 100644
--- a/sql/updates/auth/master/2023_04_02_00_auth.sql
+++ b/sql/old/10.x/auth/23041_2023_07_14/2023_04_02_00_auth.sql
diff --git a/sql/updates/auth/master/2023_04_05_00_auth.sql b/sql/old/10.x/auth/23041_2023_07_14/2023_04_05_00_auth.sql
index b97bfd62eaa..b97bfd62eaa 100644
--- a/sql/updates/auth/master/2023_04_05_00_auth.sql
+++ b/sql/old/10.x/auth/23041_2023_07_14/2023_04_05_00_auth.sql
diff --git a/sql/updates/auth/master/2023_04_06_00_auth.sql b/sql/old/10.x/auth/23041_2023_07_14/2023_04_06_00_auth.sql
index 54deaa8050e..54deaa8050e 100644
--- a/sql/updates/auth/master/2023_04_06_00_auth.sql
+++ b/sql/old/10.x/auth/23041_2023_07_14/2023_04_06_00_auth.sql
diff --git a/sql/updates/auth/master/2023_04_12_00_auth.sql b/sql/old/10.x/auth/23041_2023_07_14/2023_04_12_00_auth.sql
index e3a8a7ef9d4..e3a8a7ef9d4 100644
--- a/sql/updates/auth/master/2023_04_12_00_auth.sql
+++ b/sql/old/10.x/auth/23041_2023_07_14/2023_04_12_00_auth.sql
diff --git a/sql/updates/auth/master/2023_04_25_00_auth.sql b/sql/old/10.x/auth/23041_2023_07_14/2023_04_25_00_auth.sql
index ac8dc2c5616..ac8dc2c5616 100644
--- a/sql/updates/auth/master/2023_04_25_00_auth.sql
+++ b/sql/old/10.x/auth/23041_2023_07_14/2023_04_25_00_auth.sql
diff --git a/sql/updates/auth/master/2023_04_28_00_auth.sql b/sql/old/10.x/auth/23041_2023_07_14/2023_04_28_00_auth.sql
index dffe0fd39ec..dffe0fd39ec 100644
--- a/sql/updates/auth/master/2023_04_28_00_auth.sql
+++ b/sql/old/10.x/auth/23041_2023_07_14/2023_04_28_00_auth.sql
diff --git a/sql/updates/auth/master/2023_05_04_00_auth.sql b/sql/old/10.x/auth/23041_2023_07_14/2023_05_04_00_auth.sql
index c081beddc8c..c081beddc8c 100644
--- a/sql/updates/auth/master/2023_05_04_00_auth.sql
+++ b/sql/old/10.x/auth/23041_2023_07_14/2023_05_04_00_auth.sql
diff --git a/sql/updates/auth/master/2023_05_05_00_auth.sql b/sql/old/10.x/auth/23041_2023_07_14/2023_05_05_00_auth.sql
index ce6dfa8cd24..ce6dfa8cd24 100644
--- a/sql/updates/auth/master/2023_05_05_00_auth.sql
+++ b/sql/old/10.x/auth/23041_2023_07_14/2023_05_05_00_auth.sql
diff --git a/sql/updates/auth/master/2023_05_09_00_auth.sql b/sql/old/10.x/auth/23041_2023_07_14/2023_05_09_00_auth.sql
index 554479d53c0..554479d53c0 100644
--- a/sql/updates/auth/master/2023_05_09_00_auth.sql
+++ b/sql/old/10.x/auth/23041_2023_07_14/2023_05_09_00_auth.sql
diff --git a/sql/updates/auth/master/2023_05_15_00_auth.sql b/sql/old/10.x/auth/23041_2023_07_14/2023_05_15_00_auth.sql
index 2074cea990c..2074cea990c 100644
--- a/sql/updates/auth/master/2023_05_15_00_auth.sql
+++ b/sql/old/10.x/auth/23041_2023_07_14/2023_05_15_00_auth.sql
diff --git a/sql/updates/auth/master/2023_05_23_00_auth.sql b/sql/old/10.x/auth/23041_2023_07_14/2023_05_23_00_auth.sql
index 5ac0d9c00d7..5ac0d9c00d7 100644
--- a/sql/updates/auth/master/2023_05_23_00_auth.sql
+++ b/sql/old/10.x/auth/23041_2023_07_14/2023_05_23_00_auth.sql
diff --git a/sql/updates/auth/master/2023_05_25_00_auth.sql b/sql/old/10.x/auth/23041_2023_07_14/2023_05_25_00_auth.sql
index 99c138d9bc2..99c138d9bc2 100644
--- a/sql/updates/auth/master/2023_05_25_00_auth.sql
+++ b/sql/old/10.x/auth/23041_2023_07_14/2023_05_25_00_auth.sql
diff --git a/sql/updates/auth/master/2023_05_27_00_auth.sql b/sql/old/10.x/auth/23041_2023_07_14/2023_05_27_00_auth.sql
index 04e79d1f55e..04e79d1f55e 100644
--- a/sql/updates/auth/master/2023_05_27_00_auth.sql
+++ b/sql/old/10.x/auth/23041_2023_07_14/2023_05_27_00_auth.sql
diff --git a/sql/updates/auth/master/2023_06_06_00_auth.sql b/sql/old/10.x/auth/23041_2023_07_14/2023_06_06_00_auth.sql
index ae4b26ad79a..ae4b26ad79a 100644
--- a/sql/updates/auth/master/2023_06_06_00_auth.sql
+++ b/sql/old/10.x/auth/23041_2023_07_14/2023_06_06_00_auth.sql
diff --git a/sql/updates/auth/master/2023_06_12_00_auth.sql b/sql/old/10.x/auth/23041_2023_07_14/2023_06_12_00_auth.sql
index 4e0d6dd0619..4e0d6dd0619 100644
--- a/sql/updates/auth/master/2023_06_12_00_auth.sql
+++ b/sql/old/10.x/auth/23041_2023_07_14/2023_06_12_00_auth.sql
diff --git a/sql/updates/auth/master/2023_07_12_00_auth.sql b/sql/old/10.x/auth/23041_2023_07_14/2023_07_12_00_auth.sql
index a962847b081..a962847b081 100644
--- a/sql/updates/auth/master/2023_07_12_00_auth.sql
+++ b/sql/old/10.x/auth/23041_2023_07_14/2023_07_12_00_auth.sql
diff --git a/sql/updates/auth/master/2023_07_13_00_auth.sql b/sql/old/10.x/auth/23041_2023_07_14/2023_07_13_00_auth.sql
index 7c414422b9c..7c414422b9c 100644
--- a/sql/updates/auth/master/2023_07_13_00_auth.sql
+++ b/sql/old/10.x/auth/23041_2023_07_14/2023_07_13_00_auth.sql
diff --git a/sql/updates/characters/master/2023_04_02_00_characters.sql b/sql/old/10.x/characters/23041_2023_07_14/2023_04_02_00_characters.sql
index e28efd4754a..e28efd4754a 100644
--- a/sql/updates/characters/master/2023_04_02_00_characters.sql
+++ b/sql/old/10.x/characters/23041_2023_07_14/2023_04_02_00_characters.sql
diff --git a/sql/updates/characters/master/2023_05_04_00_characters.sql b/sql/old/10.x/characters/23041_2023_07_14/2023_05_04_00_characters.sql
index 39c40b14220..39c40b14220 100644
--- a/sql/updates/characters/master/2023_05_04_00_characters.sql
+++ b/sql/old/10.x/characters/23041_2023_07_14/2023_05_04_00_characters.sql
diff --git a/sql/updates/characters/master/2023_05_19_00_characters.sql b/sql/old/10.x/characters/23041_2023_07_14/2023_05_19_00_characters.sql
index 5ee51f5062b..5ee51f5062b 100644
--- a/sql/updates/characters/master/2023_05_19_00_characters.sql
+++ b/sql/old/10.x/characters/23041_2023_07_14/2023_05_19_00_characters.sql
diff --git a/sql/updates/hotfixes/master/2023_04_02_00_hotfixes.sql b/sql/old/10.x/hotfixes/23041_2023_07_14/2023_04_02_00_hotfixes.sql
index f09c1193f6a..f09c1193f6a 100644
--- a/sql/updates/hotfixes/master/2023_04_02_00_hotfixes.sql
+++ b/sql/old/10.x/hotfixes/23041_2023_07_14/2023_04_02_00_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2023_04_28_00_hotfixes.sql b/sql/old/10.x/hotfixes/23041_2023_07_14/2023_04_28_00_hotfixes.sql
index 859aba48516..859aba48516 100644
--- a/sql/updates/hotfixes/master/2023_04_28_00_hotfixes.sql
+++ b/sql/old/10.x/hotfixes/23041_2023_07_14/2023_04_28_00_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2023_05_04_00_hotfixes.sql b/sql/old/10.x/hotfixes/23041_2023_07_14/2023_05_04_00_hotfixes.sql
index d54b7a19318..d54b7a19318 100644
--- a/sql/updates/hotfixes/master/2023_05_04_00_hotfixes.sql
+++ b/sql/old/10.x/hotfixes/23041_2023_07_14/2023_05_04_00_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2023_05_06_00_hotfixes.sql b/sql/old/10.x/hotfixes/23041_2023_07_14/2023_05_06_00_hotfixes.sql
index 3715d5a604e..3715d5a604e 100644
--- a/sql/updates/hotfixes/master/2023_05_06_00_hotfixes.sql
+++ b/sql/old/10.x/hotfixes/23041_2023_07_14/2023_05_06_00_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2023_06_17_00_hotfixes.sql b/sql/old/10.x/hotfixes/23041_2023_07_14/2023_06_17_00_hotfixes.sql
index 45783760d1f..45783760d1f 100644
--- a/sql/updates/hotfixes/master/2023_06_17_00_hotfixes.sql
+++ b/sql/old/10.x/hotfixes/23041_2023_07_14/2023_06_17_00_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2023_07_12_00_hotfixes.sql b/sql/old/10.x/hotfixes/23041_2023_07_14/2023_07_12_00_hotfixes.sql
index d2ee5d6663a..d2ee5d6663a 100644
--- a/sql/updates/hotfixes/master/2023_07_12_00_hotfixes.sql
+++ b/sql/old/10.x/hotfixes/23041_2023_07_14/2023_07_12_00_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2023_07_14_00_hotfixes_enUS.sql b/sql/old/10.x/hotfixes/23041_2023_07_14/2023_07_14_00_hotfixes_enUS.sql
index 218d0e5c679..218d0e5c679 100644
--- a/sql/updates/hotfixes/master/2023_07_14_00_hotfixes_enUS.sql
+++ b/sql/old/10.x/hotfixes/23041_2023_07_14/2023_07_14_00_hotfixes_enUS.sql
diff --git a/sql/updates/hotfixes/master/2023_07_14_01_hotfixes_esES.sql b/sql/old/10.x/hotfixes/23041_2023_07_14/2023_07_14_01_hotfixes_esES.sql
index 95ab03f321e..95ab03f321e 100644
--- a/sql/updates/hotfixes/master/2023_07_14_01_hotfixes_esES.sql
+++ b/sql/old/10.x/hotfixes/23041_2023_07_14/2023_07_14_01_hotfixes_esES.sql
diff --git a/sql/updates/hotfixes/master/2023_07_14_02_hotfixes_exMX.sql b/sql/old/10.x/hotfixes/23041_2023_07_14/2023_07_14_02_hotfixes_exMX.sql
index e9af6caa993..e9af6caa993 100644
--- a/sql/updates/hotfixes/master/2023_07_14_02_hotfixes_exMX.sql
+++ b/sql/old/10.x/hotfixes/23041_2023_07_14/2023_07_14_02_hotfixes_exMX.sql
diff --git a/sql/updates/hotfixes/master/2023_07_14_03_hotfixes_deDE.sql b/sql/old/10.x/hotfixes/23041_2023_07_14/2023_07_14_03_hotfixes_deDE.sql
index b89d66bfaff..b89d66bfaff 100644
--- a/sql/updates/hotfixes/master/2023_07_14_03_hotfixes_deDE.sql
+++ b/sql/old/10.x/hotfixes/23041_2023_07_14/2023_07_14_03_hotfixes_deDE.sql
diff --git a/sql/updates/hotfixes/master/2023_07_14_04_hotfixes_frFR.sql b/sql/old/10.x/hotfixes/23041_2023_07_14/2023_07_14_04_hotfixes_frFR.sql
index 9b43b67f5db..9b43b67f5db 100644
--- a/sql/updates/hotfixes/master/2023_07_14_04_hotfixes_frFR.sql
+++ b/sql/old/10.x/hotfixes/23041_2023_07_14/2023_07_14_04_hotfixes_frFR.sql
diff --git a/sql/updates/hotfixes/master/2023_07_14_05_hotfixes_itIT.sql b/sql/old/10.x/hotfixes/23041_2023_07_14/2023_07_14_05_hotfixes_itIT.sql
index c630d0cf08d..c630d0cf08d 100644
--- a/sql/updates/hotfixes/master/2023_07_14_05_hotfixes_itIT.sql
+++ b/sql/old/10.x/hotfixes/23041_2023_07_14/2023_07_14_05_hotfixes_itIT.sql
diff --git a/sql/updates/hotfixes/master/2023_07_14_06_hotfixes_koKR.sql b/sql/old/10.x/hotfixes/23041_2023_07_14/2023_07_14_06_hotfixes_koKR.sql
index 356f8d87d1a..356f8d87d1a 100644
--- a/sql/updates/hotfixes/master/2023_07_14_06_hotfixes_koKR.sql
+++ b/sql/old/10.x/hotfixes/23041_2023_07_14/2023_07_14_06_hotfixes_koKR.sql
diff --git a/sql/updates/hotfixes/master/2023_07_14_07_hotfixes_ptBR.sql b/sql/old/10.x/hotfixes/23041_2023_07_14/2023_07_14_07_hotfixes_ptBR.sql
index ee90560a1f4..ee90560a1f4 100644
--- a/sql/updates/hotfixes/master/2023_07_14_07_hotfixes_ptBR.sql
+++ b/sql/old/10.x/hotfixes/23041_2023_07_14/2023_07_14_07_hotfixes_ptBR.sql
diff --git a/sql/updates/hotfixes/master/2023_07_14_08_hotfixes_ruRU.sql b/sql/old/10.x/hotfixes/23041_2023_07_14/2023_07_14_08_hotfixes_ruRU.sql
index caeb37efb9b..caeb37efb9b 100644
--- a/sql/updates/hotfixes/master/2023_07_14_08_hotfixes_ruRU.sql
+++ b/sql/old/10.x/hotfixes/23041_2023_07_14/2023_07_14_08_hotfixes_ruRU.sql
diff --git a/sql/updates/hotfixes/master/2023_07_14_09_hotfixes_zhCN.sql b/sql/old/10.x/hotfixes/23041_2023_07_14/2023_07_14_09_hotfixes_zhCN.sql
index 622afb090d3..622afb090d3 100644
--- a/sql/updates/hotfixes/master/2023_07_14_09_hotfixes_zhCN.sql
+++ b/sql/old/10.x/hotfixes/23041_2023_07_14/2023_07_14_09_hotfixes_zhCN.sql
diff --git a/sql/updates/hotfixes/master/2023_07_14_10_hotfixes_zhTW.sql b/sql/old/10.x/hotfixes/23041_2023_07_14/2023_07_14_10_hotfixes_zhTW.sql
index 3ad20d93503..3ad20d93503 100644
--- a/sql/updates/hotfixes/master/2023_07_14_10_hotfixes_zhTW.sql
+++ b/sql/old/10.x/hotfixes/23041_2023_07_14/2023_07_14_10_hotfixes_zhTW.sql
diff --git a/sql/updates/world/master/2023_04_02_01_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_04_02_01_world.sql
index df170321525..df170321525 100644
--- a/sql/updates/world/master/2023_04_02_01_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_04_02_01_world.sql
diff --git a/sql/updates/world/master/2023_04_02_02_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_04_02_02_world.sql
index 6b2969c43a2..6b2969c43a2 100644
--- a/sql/updates/world/master/2023_04_02_02_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_04_02_02_world.sql
diff --git a/sql/updates/world/master/2023_04_02_03_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_04_02_03_world.sql
index 9ba482353f9..9ba482353f9 100644
--- a/sql/updates/world/master/2023_04_02_03_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_04_02_03_world.sql
diff --git a/sql/updates/world/master/2023_04_03_00_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_04_03_00_world.sql
index 067abcea5d4..067abcea5d4 100644
--- a/sql/updates/world/master/2023_04_03_00_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_04_03_00_world.sql
diff --git a/sql/updates/world/master/2023_04_04_00_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_04_04_00_world.sql
index 709b7d5189e..709b7d5189e 100644
--- a/sql/updates/world/master/2023_04_04_00_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_04_04_00_world.sql
diff --git a/sql/updates/world/master/2023_04_04_01_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_04_04_01_world.sql
index 34ac9d59de4..34ac9d59de4 100644
--- a/sql/updates/world/master/2023_04_04_01_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_04_04_01_world.sql
diff --git a/sql/updates/world/master/2023_04_05_00_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_04_05_00_world.sql
index 7287d23d45b..7287d23d45b 100644
--- a/sql/updates/world/master/2023_04_05_00_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_04_05_00_world.sql
diff --git a/sql/updates/world/master/2023_04_06_00_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_04_06_00_world.sql
index 82ca9eb6d69..82ca9eb6d69 100644
--- a/sql/updates/world/master/2023_04_06_00_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_04_06_00_world.sql
diff --git a/sql/updates/world/master/2023_04_06_01_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_04_06_01_world.sql
index 2dc5eda3ce7..2dc5eda3ce7 100644
--- a/sql/updates/world/master/2023_04_06_01_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_04_06_01_world.sql
diff --git a/sql/updates/world/master/2023_04_06_02_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_04_06_02_world.sql
index 2423102a88b..2423102a88b 100644
--- a/sql/updates/world/master/2023_04_06_02_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_04_06_02_world.sql
diff --git a/sql/updates/world/master/2023_04_06_03_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_04_06_03_world.sql
index 3174299d162..3174299d162 100644
--- a/sql/updates/world/master/2023_04_06_03_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_04_06_03_world.sql
diff --git a/sql/updates/world/master/2023_04_06_04_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_04_06_04_world.sql
index 94e22bcf9ab..94e22bcf9ab 100644
--- a/sql/updates/world/master/2023_04_06_04_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_04_06_04_world.sql
diff --git a/sql/updates/world/master/2023_04_08_00_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_04_08_00_world.sql
index 91162d0b3f2..91162d0b3f2 100644
--- a/sql/updates/world/master/2023_04_08_00_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_04_08_00_world.sql
diff --git a/sql/updates/world/master/2023_04_08_01_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_04_08_01_world.sql
index 03ebde3409b..03ebde3409b 100644
--- a/sql/updates/world/master/2023_04_08_01_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_04_08_01_world.sql
diff --git a/sql/updates/world/master/2023_04_08_02_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_04_08_02_world.sql
index 62f3bf278db..62f3bf278db 100644
--- a/sql/updates/world/master/2023_04_08_02_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_04_08_02_world.sql
diff --git a/sql/updates/world/master/2023_04_08_03_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_04_08_03_world.sql
index 50bc3e5baa1..50bc3e5baa1 100644
--- a/sql/updates/world/master/2023_04_08_03_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_04_08_03_world.sql
diff --git a/sql/updates/world/master/2023_04_08_04_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_04_08_04_world.sql
index 0b626194387..0b626194387 100644
--- a/sql/updates/world/master/2023_04_08_04_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_04_08_04_world.sql
diff --git a/sql/updates/world/master/2023_04_09_00_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_04_09_00_world.sql
index 93915f47935..93915f47935 100644
--- a/sql/updates/world/master/2023_04_09_00_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_04_09_00_world.sql
diff --git a/sql/updates/world/master/2023_04_09_01_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_04_09_01_world.sql
index 45b68a57170..45b68a57170 100644
--- a/sql/updates/world/master/2023_04_09_01_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_04_09_01_world.sql
diff --git a/sql/updates/world/master/2023_04_09_02_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_04_09_02_world.sql
index 088aaee95e7..088aaee95e7 100644
--- a/sql/updates/world/master/2023_04_09_02_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_04_09_02_world.sql
diff --git a/sql/updates/world/master/2023_04_09_03_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_04_09_03_world.sql
index 31f0934b849..31f0934b849 100644
--- a/sql/updates/world/master/2023_04_09_03_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_04_09_03_world.sql
diff --git a/sql/updates/world/master/2023_04_09_04_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_04_09_04_world.sql
index f1a3dbb18a4..f1a3dbb18a4 100644
--- a/sql/updates/world/master/2023_04_09_04_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_04_09_04_world.sql
diff --git a/sql/updates/world/master/2023_04_10_00_world_script_waypoints.sql b/sql/old/10.x/world/23041_2023_07_14/2023_04_10_00_world_script_waypoints.sql
index d349060a860..d349060a860 100644
--- a/sql/updates/world/master/2023_04_10_00_world_script_waypoints.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_04_10_00_world_script_waypoints.sql
diff --git a/sql/updates/world/master/2023_04_15_00_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_04_15_00_world.sql
index fb3688b3a2a..fb3688b3a2a 100644
--- a/sql/updates/world/master/2023_04_15_00_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_04_15_00_world.sql
diff --git a/sql/updates/world/master/2023_04_15_01_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_04_15_01_world.sql
index 1aab9fd9320..1aab9fd9320 100644
--- a/sql/updates/world/master/2023_04_15_01_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_04_15_01_world.sql
diff --git a/sql/updates/world/master/2023_04_15_02_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_04_15_02_world.sql
index 2d3ad93fc8d..2d3ad93fc8d 100644
--- a/sql/updates/world/master/2023_04_15_02_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_04_15_02_world.sql
diff --git a/sql/updates/world/master/2023_04_15_03_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_04_15_03_world.sql
index 15b469898f9..15b469898f9 100644
--- a/sql/updates/world/master/2023_04_15_03_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_04_15_03_world.sql
diff --git a/sql/updates/world/master/2023_04_15_04_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_04_15_04_world.sql
index 774aa2649d2..774aa2649d2 100644
--- a/sql/updates/world/master/2023_04_15_04_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_04_15_04_world.sql
diff --git a/sql/updates/world/master/2023_04_15_05_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_04_15_05_world.sql
index 6054264b4d9..6054264b4d9 100644
--- a/sql/updates/world/master/2023_04_15_05_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_04_15_05_world.sql
diff --git a/sql/updates/world/master/2023_04_15_06_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_04_15_06_world.sql
index eee7881382b..eee7881382b 100644
--- a/sql/updates/world/master/2023_04_15_06_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_04_15_06_world.sql
diff --git a/sql/updates/world/master/2023_04_15_07_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_04_15_07_world.sql
index 3aea8a1d148..3aea8a1d148 100644
--- a/sql/updates/world/master/2023_04_15_07_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_04_15_07_world.sql
diff --git a/sql/updates/world/master/2023_04_16_00_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_04_16_00_world.sql
index 83d6abb7dca..83d6abb7dca 100644
--- a/sql/updates/world/master/2023_04_16_00_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_04_16_00_world.sql
diff --git a/sql/updates/world/master/2023_04_16_01_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_04_16_01_world.sql
index 583e00c9ddc..583e00c9ddc 100644
--- a/sql/updates/world/master/2023_04_16_01_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_04_16_01_world.sql
diff --git a/sql/updates/world/master/2023_04_17_00_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_04_17_00_world.sql
index 0bf3b51382c..0bf3b51382c 100644
--- a/sql/updates/world/master/2023_04_17_00_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_04_17_00_world.sql
diff --git a/sql/updates/world/master/2023_04_19_00_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_04_19_00_world.sql
index f7564c8e3ac..f7564c8e3ac 100644
--- a/sql/updates/world/master/2023_04_19_00_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_04_19_00_world.sql
diff --git a/sql/updates/world/master/2023_04_23_00_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_04_23_00_world.sql
index 8917b3b097d..8917b3b097d 100644
--- a/sql/updates/world/master/2023_04_23_00_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_04_23_00_world.sql
diff --git a/sql/updates/world/master/2023_04_23_01_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_04_23_01_world.sql
index 7ca1406abd8..7ca1406abd8 100644
--- a/sql/updates/world/master/2023_04_23_01_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_04_23_01_world.sql
diff --git a/sql/updates/world/master/2023_04_23_02_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_04_23_02_world.sql
index 81410b573fd..81410b573fd 100644
--- a/sql/updates/world/master/2023_04_23_02_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_04_23_02_world.sql
diff --git a/sql/updates/world/master/2023_04_24_00_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_04_24_00_world.sql
index aeef56ad4b7..aeef56ad4b7 100644
--- a/sql/updates/world/master/2023_04_24_00_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_04_24_00_world.sql
diff --git a/sql/updates/world/master/2023_04_24_01_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_04_24_01_world.sql
index e07ff578915..e07ff578915 100644
--- a/sql/updates/world/master/2023_04_24_01_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_04_24_01_world.sql
diff --git a/sql/updates/world/master/2023_04_24_02_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_04_24_02_world.sql
index 1268da5f9e8..1268da5f9e8 100644
--- a/sql/updates/world/master/2023_04_24_02_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_04_24_02_world.sql
diff --git a/sql/updates/world/master/2023_04_24_03_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_04_24_03_world.sql
index 25b2fa6aa00..25b2fa6aa00 100644
--- a/sql/updates/world/master/2023_04_24_03_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_04_24_03_world.sql
diff --git a/sql/updates/world/master/2023_04_24_04_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_04_24_04_world.sql
index c9eb9f4022e..c9eb9f4022e 100644
--- a/sql/updates/world/master/2023_04_24_04_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_04_24_04_world.sql
diff --git a/sql/updates/world/master/2023_04_25_00_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_04_25_00_world.sql
index 8fb79dd32f6..8fb79dd32f6 100644
--- a/sql/updates/world/master/2023_04_25_00_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_04_25_00_world.sql
diff --git a/sql/updates/world/master/2023_04_25_01_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_04_25_01_world.sql
index aa74359ca95..aa74359ca95 100644
--- a/sql/updates/world/master/2023_04_25_01_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_04_25_01_world.sql
diff --git a/sql/updates/world/master/2023_04_27_00_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_04_27_00_world.sql
index 155e2db5413..155e2db5413 100644
--- a/sql/updates/world/master/2023_04_27_00_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_04_27_00_world.sql
diff --git a/sql/updates/world/master/2023_05_02_00_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_05_02_00_world.sql
index d75e3c0d717..d75e3c0d717 100644
--- a/sql/updates/world/master/2023_05_02_00_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_05_02_00_world.sql
diff --git a/sql/updates/world/master/2023_05_02_01_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_05_02_01_world.sql
index 065bae1b5ac..065bae1b5ac 100644
--- a/sql/updates/world/master/2023_05_02_01_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_05_02_01_world.sql
diff --git a/sql/updates/world/master/2023_05_03_00_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_05_03_00_world.sql
index 8928e50434c..8928e50434c 100644
--- a/sql/updates/world/master/2023_05_03_00_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_05_03_00_world.sql
diff --git a/sql/updates/world/master/2023_05_05_00_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_05_05_00_world.sql
index 7a13d94f5c5..7a13d94f5c5 100644
--- a/sql/updates/world/master/2023_05_05_00_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_05_05_00_world.sql
diff --git a/sql/updates/world/master/2023_05_05_01_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_05_05_01_world.sql
index 4da800faf03..4da800faf03 100644
--- a/sql/updates/world/master/2023_05_05_01_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_05_05_01_world.sql
diff --git a/sql/updates/world/master/2023_05_06_00_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_05_06_00_world.sql
index 85e69426e6c..85e69426e6c 100644
--- a/sql/updates/world/master/2023_05_06_00_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_05_06_00_world.sql
diff --git a/sql/updates/world/master/2023_05_06_01_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_05_06_01_world.sql
index 58db64543c2..58db64543c2 100644
--- a/sql/updates/world/master/2023_05_06_01_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_05_06_01_world.sql
diff --git a/sql/updates/world/master/2023_05_07_00_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_05_07_00_world.sql
index 501a89e40cb..501a89e40cb 100644
--- a/sql/updates/world/master/2023_05_07_00_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_05_07_00_world.sql
diff --git a/sql/updates/world/master/2023_05_07_01_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_05_07_01_world.sql
index 6e6300921c8..6e6300921c8 100644
--- a/sql/updates/world/master/2023_05_07_01_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_05_07_01_world.sql
diff --git a/sql/updates/world/master/2023_05_07_02_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_05_07_02_world.sql
index 85b7acfff83..85b7acfff83 100644
--- a/sql/updates/world/master/2023_05_07_02_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_05_07_02_world.sql
diff --git a/sql/updates/world/master/2023_05_07_03_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_05_07_03_world.sql
index 08d4b62add0..08d4b62add0 100644
--- a/sql/updates/world/master/2023_05_07_03_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_05_07_03_world.sql
diff --git a/sql/updates/world/master/2023_05_07_04_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_05_07_04_world.sql
index 2f15c012a09..2f15c012a09 100644
--- a/sql/updates/world/master/2023_05_07_04_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_05_07_04_world.sql
diff --git a/sql/updates/world/master/2023_05_07_05_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_05_07_05_world.sql
index ddc0f96bc47..ddc0f96bc47 100644
--- a/sql/updates/world/master/2023_05_07_05_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_05_07_05_world.sql
diff --git a/sql/updates/world/master/2023_05_07_06_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_05_07_06_world.sql
index f8219d14354..f8219d14354 100644
--- a/sql/updates/world/master/2023_05_07_06_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_05_07_06_world.sql
diff --git a/sql/updates/world/master/2023_05_07_07_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_05_07_07_world.sql
index 755642c5719..755642c5719 100644
--- a/sql/updates/world/master/2023_05_07_07_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_05_07_07_world.sql
diff --git a/sql/updates/world/master/2023_05_08_00_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_05_08_00_world.sql
index 4a8ed35d586..4a8ed35d586 100644
--- a/sql/updates/world/master/2023_05_08_00_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_05_08_00_world.sql
diff --git a/sql/updates/world/master/2023_05_09_00_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_05_09_00_world.sql
index 67e974aac87..67e974aac87 100644
--- a/sql/updates/world/master/2023_05_09_00_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_05_09_00_world.sql
diff --git a/sql/updates/world/master/2023_05_09_01_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_05_09_01_world.sql
index fdbb88cc924..fdbb88cc924 100644
--- a/sql/updates/world/master/2023_05_09_01_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_05_09_01_world.sql
diff --git a/sql/updates/world/master/2023_05_13_00_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_05_13_00_world.sql
index 40387aa66d7..40387aa66d7 100644
--- a/sql/updates/world/master/2023_05_13_00_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_05_13_00_world.sql
diff --git a/sql/updates/world/master/2023_05_14_00_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_05_14_00_world.sql
index 8b6aa14e407..8b6aa14e407 100644
--- a/sql/updates/world/master/2023_05_14_00_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_05_14_00_world.sql
diff --git a/sql/updates/world/master/2023_05_15_00_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_05_15_00_world.sql
index 64bfc8d03c7..64bfc8d03c7 100644
--- a/sql/updates/world/master/2023_05_15_00_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_05_15_00_world.sql
diff --git a/sql/updates/world/master/2023_05_15_01_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_05_15_01_world.sql
index 33701e7273d..33701e7273d 100644
--- a/sql/updates/world/master/2023_05_15_01_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_05_15_01_world.sql
diff --git a/sql/updates/world/master/2023_05_15_02_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_05_15_02_world.sql
index c1fcc90ef3e..c1fcc90ef3e 100644
--- a/sql/updates/world/master/2023_05_15_02_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_05_15_02_world.sql
diff --git a/sql/updates/world/master/2023_05_17_00_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_05_17_00_world.sql
index 9058d5c9e49..9058d5c9e49 100644
--- a/sql/updates/world/master/2023_05_17_00_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_05_17_00_world.sql
diff --git a/sql/updates/world/master/2023_05_18_00_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_05_18_00_world.sql
index 501f673b7b3..501f673b7b3 100644
--- a/sql/updates/world/master/2023_05_18_00_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_05_18_00_world.sql
diff --git a/sql/updates/world/master/2023_05_18_01_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_05_18_01_world.sql
index 658547c5619..658547c5619 100644
--- a/sql/updates/world/master/2023_05_18_01_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_05_18_01_world.sql
diff --git a/sql/updates/world/master/2023_05_18_02_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_05_18_02_world.sql
index 7dfc26f3e5c..7dfc26f3e5c 100644
--- a/sql/updates/world/master/2023_05_18_02_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_05_18_02_world.sql
diff --git a/sql/updates/world/master/2023_05_19_00_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_05_19_00_world.sql
index 33d67eda74d..33d67eda74d 100644
--- a/sql/updates/world/master/2023_05_19_00_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_05_19_00_world.sql
diff --git a/sql/updates/world/master/2023_05_21_00_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_05_21_00_world.sql
index 5a1ab62ffb6..5a1ab62ffb6 100644
--- a/sql/updates/world/master/2023_05_21_00_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_05_21_00_world.sql
diff --git a/sql/updates/world/master/2023_05_22_00_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_05_22_00_world.sql
index 12a07bb9874..12a07bb9874 100644
--- a/sql/updates/world/master/2023_05_22_00_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_05_22_00_world.sql
diff --git a/sql/updates/world/master/2023_05_22_01_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_05_22_01_world.sql
index 22ad25d0618..22ad25d0618 100644
--- a/sql/updates/world/master/2023_05_22_01_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_05_22_01_world.sql
diff --git a/sql/updates/world/master/2023_05_24_00_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_05_24_00_world.sql
index 74b14748fe2..74b14748fe2 100644
--- a/sql/updates/world/master/2023_05_24_00_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_05_24_00_world.sql
diff --git a/sql/updates/world/master/2023_05_28_00_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_05_28_00_world.sql
index 5826df443b4..5826df443b4 100644
--- a/sql/updates/world/master/2023_05_28_00_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_05_28_00_world.sql
diff --git a/sql/updates/world/master/2023_05_29_00_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_05_29_00_world.sql
index eb157a33540..eb157a33540 100644
--- a/sql/updates/world/master/2023_05_29_00_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_05_29_00_world.sql
diff --git a/sql/updates/world/master/2023_05_31_00_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_05_31_00_world.sql
index f0aeebeb56c..f0aeebeb56c 100644
--- a/sql/updates/world/master/2023_05_31_00_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_05_31_00_world.sql
diff --git a/sql/updates/world/master/2023_06_01_00_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_06_01_00_world.sql
index a8bdf2b03ed..a8bdf2b03ed 100644
--- a/sql/updates/world/master/2023_06_01_00_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_06_01_00_world.sql
diff --git a/sql/updates/world/master/2023_06_01_01_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_06_01_01_world.sql
index 04f99012c1c..04f99012c1c 100644
--- a/sql/updates/world/master/2023_06_01_01_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_06_01_01_world.sql
diff --git a/sql/updates/world/master/2023_06_01_02_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_06_01_02_world.sql
index 107f6ec743f..107f6ec743f 100644
--- a/sql/updates/world/master/2023_06_01_02_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_06_01_02_world.sql
diff --git a/sql/updates/world/master/2023_06_01_03_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_06_01_03_world.sql
index abc9d0d49d8..abc9d0d49d8 100644
--- a/sql/updates/world/master/2023_06_01_03_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_06_01_03_world.sql
diff --git a/sql/updates/world/master/2023_06_01_04_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_06_01_04_world.sql
index da139a8a6fe..da139a8a6fe 100644
--- a/sql/updates/world/master/2023_06_01_04_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_06_01_04_world.sql
diff --git a/sql/updates/world/master/2023_06_01_05_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_06_01_05_world.sql
index a74cfff65d5..a74cfff65d5 100644
--- a/sql/updates/world/master/2023_06_01_05_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_06_01_05_world.sql
diff --git a/sql/updates/world/master/2023_06_01_06_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_06_01_06_world.sql
index 6a8b29bdcdb..6a8b29bdcdb 100644
--- a/sql/updates/world/master/2023_06_01_06_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_06_01_06_world.sql
diff --git a/sql/updates/world/master/2023_06_01_07_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_06_01_07_world.sql
index 418ced7fd77..418ced7fd77 100644
--- a/sql/updates/world/master/2023_06_01_07_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_06_01_07_world.sql
diff --git a/sql/updates/world/master/2023_06_01_08_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_06_01_08_world.sql
index c35fbfed11e..c35fbfed11e 100644
--- a/sql/updates/world/master/2023_06_01_08_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_06_01_08_world.sql
diff --git a/sql/updates/world/master/2023_06_01_09_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_06_01_09_world.sql
index 97bac93b996..97bac93b996 100644
--- a/sql/updates/world/master/2023_06_01_09_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_06_01_09_world.sql
diff --git a/sql/updates/world/master/2023_06_02_00_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_06_02_00_world.sql
index 0ebca464ea6..0ebca464ea6 100644
--- a/sql/updates/world/master/2023_06_02_00_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_06_02_00_world.sql
diff --git a/sql/updates/world/master/2023_06_02_01_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_06_02_01_world.sql
index f7df9a0fe78..f7df9a0fe78 100644
--- a/sql/updates/world/master/2023_06_02_01_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_06_02_01_world.sql
diff --git a/sql/updates/world/master/2023_06_03_00_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_06_03_00_world.sql
index 285d23c52ba..285d23c52ba 100644
--- a/sql/updates/world/master/2023_06_03_00_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_06_03_00_world.sql
diff --git a/sql/updates/world/master/2023_06_03_01_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_06_03_01_world.sql
index aa20c9755b3..aa20c9755b3 100644
--- a/sql/updates/world/master/2023_06_03_01_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_06_03_01_world.sql
diff --git a/sql/updates/world/master/2023_06_03_02_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_06_03_02_world.sql
index 5f47a79cc66..5f47a79cc66 100644
--- a/sql/updates/world/master/2023_06_03_02_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_06_03_02_world.sql
diff --git a/sql/updates/world/master/2023_06_04_00_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_06_04_00_world.sql
index 32d674c90aa..32d674c90aa 100644
--- a/sql/updates/world/master/2023_06_04_00_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_06_04_00_world.sql
diff --git a/sql/updates/world/master/2023_06_04_01_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_06_04_01_world.sql
index b7f695eca44..b7f695eca44 100644
--- a/sql/updates/world/master/2023_06_04_01_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_06_04_01_world.sql
diff --git a/sql/updates/world/master/2023_06_05_00_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_06_05_00_world.sql
index c137f6925f0..c137f6925f0 100644
--- a/sql/updates/world/master/2023_06_05_00_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_06_05_00_world.sql
diff --git a/sql/updates/world/master/2023_06_05_01_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_06_05_01_world.sql
index 4905ffe73b4..4905ffe73b4 100644
--- a/sql/updates/world/master/2023_06_05_01_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_06_05_01_world.sql
diff --git a/sql/updates/world/master/2023_06_10_00_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_06_10_00_world.sql
index f61e7b0f0eb..f61e7b0f0eb 100644
--- a/sql/updates/world/master/2023_06_10_00_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_06_10_00_world.sql
diff --git a/sql/updates/world/master/2023_06_18_00_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_06_18_00_world.sql
index 9822a1d24c8..9822a1d24c8 100644
--- a/sql/updates/world/master/2023_06_18_00_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_06_18_00_world.sql
diff --git a/sql/updates/world/master/2023_06_18_01_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_06_18_01_world.sql
index 31ce20f3f96..31ce20f3f96 100644
--- a/sql/updates/world/master/2023_06_18_01_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_06_18_01_world.sql
diff --git a/sql/updates/world/master/2023_06_21_00_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_06_21_00_world.sql
index 5a72d6e08cb..5a72d6e08cb 100644
--- a/sql/updates/world/master/2023_06_21_00_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_06_21_00_world.sql
diff --git a/sql/updates/world/master/2023_06_21_01_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_06_21_01_world.sql
index 9a5d0e20eac..9a5d0e20eac 100644
--- a/sql/updates/world/master/2023_06_21_01_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_06_21_01_world.sql
diff --git a/sql/updates/world/master/2023_06_21_02_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_06_21_02_world.sql
index 8323db3faae..8323db3faae 100644
--- a/sql/updates/world/master/2023_06_21_02_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_06_21_02_world.sql
diff --git a/sql/updates/world/master/2023_06_21_03_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_06_21_03_world.sql
index a5a3c29aa2f..a5a3c29aa2f 100644
--- a/sql/updates/world/master/2023_06_21_03_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_06_21_03_world.sql
diff --git a/sql/updates/world/master/2023_06_21_04_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_06_21_04_world.sql
index 0f6397ac7b9..0f6397ac7b9 100644
--- a/sql/updates/world/master/2023_06_21_04_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_06_21_04_world.sql
diff --git a/sql/updates/world/master/2023_06_23_00_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_06_23_00_world.sql
index b218ce80315..b218ce80315 100644
--- a/sql/updates/world/master/2023_06_23_00_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_06_23_00_world.sql
diff --git a/sql/updates/world/master/2023_06_24_00_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_06_24_00_world.sql
index 1048275b192..1048275b192 100644
--- a/sql/updates/world/master/2023_06_24_00_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_06_24_00_world.sql
diff --git a/sql/updates/world/master/2023_06_24_01_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_06_24_01_world.sql
index 39d8a48871c..39d8a48871c 100644
--- a/sql/updates/world/master/2023_06_24_01_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_06_24_01_world.sql
diff --git a/sql/updates/world/master/2023_06_25_00_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_06_25_00_world.sql
index 89b275aca50..89b275aca50 100644
--- a/sql/updates/world/master/2023_06_25_00_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_06_25_00_world.sql
diff --git a/sql/updates/world/master/2023_06_27_00_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_06_27_00_world.sql
index f780376fe93..f780376fe93 100644
--- a/sql/updates/world/master/2023_06_27_00_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_06_27_00_world.sql
diff --git a/sql/updates/world/master/2023_06_27_01_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_06_27_01_world.sql
index 9d7ebbe393d..9d7ebbe393d 100644
--- a/sql/updates/world/master/2023_06_27_01_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_06_27_01_world.sql
diff --git a/sql/updates/world/master/2023_06_27_02_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_06_27_02_world.sql
index ab068facece..ab068facece 100644
--- a/sql/updates/world/master/2023_06_27_02_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_06_27_02_world.sql
diff --git a/sql/updates/world/master/2023_06_28_00_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_06_28_00_world.sql
index b1535e380a3..b1535e380a3 100644
--- a/sql/updates/world/master/2023_06_28_00_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_06_28_00_world.sql
diff --git a/sql/updates/world/master/2023_06_28_01_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_06_28_01_world.sql
index 73f1ef7e9b4..73f1ef7e9b4 100644
--- a/sql/updates/world/master/2023_06_28_01_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_06_28_01_world.sql
diff --git a/sql/updates/world/master/2023_06_28_02_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_06_28_02_world.sql
index 1056212d0ae..1056212d0ae 100644
--- a/sql/updates/world/master/2023_06_28_02_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_06_28_02_world.sql
diff --git a/sql/updates/world/master/2023_06_28_03_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_06_28_03_world.sql
index 2dc492eba5a..2dc492eba5a 100644
--- a/sql/updates/world/master/2023_06_28_03_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_06_28_03_world.sql
diff --git a/sql/updates/world/master/2023_06_28_04_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_06_28_04_world.sql
index be0c42de48f..be0c42de48f 100644
--- a/sql/updates/world/master/2023_06_28_04_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_06_28_04_world.sql
diff --git a/sql/updates/world/master/2023_06_28_05_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_06_28_05_world.sql
index 93c70f9e027..93c70f9e027 100644
--- a/sql/updates/world/master/2023_06_28_05_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_06_28_05_world.sql
diff --git a/sql/updates/world/master/2023_06_28_06_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_06_28_06_world.sql
index 329b581987c..329b581987c 100644
--- a/sql/updates/world/master/2023_06_28_06_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_06_28_06_world.sql
diff --git a/sql/updates/world/master/2023_06_28_07_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_06_28_07_world.sql
index 06670a6f228..06670a6f228 100644
--- a/sql/updates/world/master/2023_06_28_07_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_06_28_07_world.sql
diff --git a/sql/updates/world/master/2023_06_28_08_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_06_28_08_world.sql
index 52c9a4c89f1..52c9a4c89f1 100644
--- a/sql/updates/world/master/2023_06_28_08_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_06_28_08_world.sql
diff --git a/sql/updates/world/master/2023_06_28_09_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_06_28_09_world.sql
index f01acb3ba18..f01acb3ba18 100644
--- a/sql/updates/world/master/2023_06_28_09_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_06_28_09_world.sql
diff --git a/sql/updates/world/master/2023_06_28_10_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_06_28_10_world.sql
index b127272304f..b127272304f 100644
--- a/sql/updates/world/master/2023_06_28_10_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_06_28_10_world.sql
diff --git a/sql/updates/world/master/2023_06_28_11_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_06_28_11_world.sql
index 22ed19fb955..22ed19fb955 100644
--- a/sql/updates/world/master/2023_06_28_11_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_06_28_11_world.sql
diff --git a/sql/updates/world/master/2023_06_28_12_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_06_28_12_world.sql
index d03a4a8d046..d03a4a8d046 100644
--- a/sql/updates/world/master/2023_06_28_12_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_06_28_12_world.sql
diff --git a/sql/updates/world/master/2023_06_28_13_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_06_28_13_world.sql
index 71512e4c3f4..71512e4c3f4 100644
--- a/sql/updates/world/master/2023_06_28_13_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_06_28_13_world.sql
diff --git a/sql/updates/world/master/2023_06_30_00_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_06_30_00_world.sql
index 7cc8e0eeecd..7cc8e0eeecd 100644
--- a/sql/updates/world/master/2023_06_30_00_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_06_30_00_world.sql
diff --git a/sql/updates/world/master/2023_07_01_00_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_07_01_00_world.sql
index cfea1c6f620..cfea1c6f620 100644
--- a/sql/updates/world/master/2023_07_01_00_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_07_01_00_world.sql
diff --git a/sql/updates/world/master/2023_07_01_01_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_07_01_01_world.sql
index f44583c84e9..f44583c84e9 100644
--- a/sql/updates/world/master/2023_07_01_01_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_07_01_01_world.sql
diff --git a/sql/updates/world/master/2023_07_03_00_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_07_03_00_world.sql
index 0d4ee88d1ee..0d4ee88d1ee 100644
--- a/sql/updates/world/master/2023_07_03_00_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_07_03_00_world.sql
diff --git a/sql/updates/world/master/2023_07_03_01_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_07_03_01_world.sql
index 00a5ab8b2ba..00a5ab8b2ba 100644
--- a/sql/updates/world/master/2023_07_03_01_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_07_03_01_world.sql
diff --git a/sql/updates/world/master/2023_07_04_00_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_07_04_00_world.sql
index 765b8c0e2f1..765b8c0e2f1 100644
--- a/sql/updates/world/master/2023_07_04_00_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_07_04_00_world.sql
diff --git a/sql/updates/world/master/2023_07_04_01_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_07_04_01_world.sql
index 2f01a2feaef..2f01a2feaef 100644
--- a/sql/updates/world/master/2023_07_04_01_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_07_04_01_world.sql
diff --git a/sql/updates/world/master/2023_07_04_02_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_07_04_02_world.sql
index b32910593d9..b32910593d9 100644
--- a/sql/updates/world/master/2023_07_04_02_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_07_04_02_world.sql
diff --git a/sql/updates/world/master/2023_07_04_03_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_07_04_03_world.sql
index e07b3353cab..e07b3353cab 100644
--- a/sql/updates/world/master/2023_07_04_03_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_07_04_03_world.sql
diff --git a/sql/updates/world/master/2023_07_04_04_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_07_04_04_world.sql
index 624f67257a1..624f67257a1 100644
--- a/sql/updates/world/master/2023_07_04_04_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_07_04_04_world.sql
diff --git a/sql/updates/world/master/2023_07_04_05_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_07_04_05_world.sql
index 25d01081b05..25d01081b05 100644
--- a/sql/updates/world/master/2023_07_04_05_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_07_04_05_world.sql
diff --git a/sql/updates/world/master/2023_07_04_06_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_07_04_06_world.sql
index 81b32e0c411..81b32e0c411 100644
--- a/sql/updates/world/master/2023_07_04_06_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_07_04_06_world.sql
diff --git a/sql/updates/world/master/2023_07_04_07_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_07_04_07_world.sql
index 99d62bcf53c..99d62bcf53c 100644
--- a/sql/updates/world/master/2023_07_04_07_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_07_04_07_world.sql
diff --git a/sql/updates/world/master/2023_07_04_08_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_07_04_08_world.sql
index 7e990dcfd44..7e990dcfd44 100644
--- a/sql/updates/world/master/2023_07_04_08_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_07_04_08_world.sql
diff --git a/sql/updates/world/master/2023_07_05_00_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_07_05_00_world.sql
index 57653a3185f..57653a3185f 100644
--- a/sql/updates/world/master/2023_07_05_00_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_07_05_00_world.sql
diff --git a/sql/updates/world/master/2023_07_05_01_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_07_05_01_world.sql
index 6786d7a24fe..6786d7a24fe 100644
--- a/sql/updates/world/master/2023_07_05_01_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_07_05_01_world.sql
diff --git a/sql/updates/world/master/2023_07_05_02_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_07_05_02_world.sql
index b1e50e7f185..b1e50e7f185 100644
--- a/sql/updates/world/master/2023_07_05_02_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_07_05_02_world.sql
diff --git a/sql/updates/world/master/2023_07_05_03_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_07_05_03_world.sql
index 412a587582f..412a587582f 100644
--- a/sql/updates/world/master/2023_07_05_03_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_07_05_03_world.sql
diff --git a/sql/updates/world/master/2023_07_05_04_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_07_05_04_world.sql
index bab46207320..bab46207320 100644
--- a/sql/updates/world/master/2023_07_05_04_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_07_05_04_world.sql
diff --git a/sql/updates/world/master/2023_07_06_00_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_07_06_00_world.sql
index d1cace73180..d1cace73180 100644
--- a/sql/updates/world/master/2023_07_06_00_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_07_06_00_world.sql
diff --git a/sql/updates/world/master/2023_07_09_00_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_07_09_00_world.sql
index 37cf0ff04d3..37cf0ff04d3 100644
--- a/sql/updates/world/master/2023_07_09_00_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_07_09_00_world.sql
diff --git a/sql/updates/world/master/2023_07_09_01_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_07_09_01_world.sql
index 1107b0db29b..1107b0db29b 100644
--- a/sql/updates/world/master/2023_07_09_01_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_07_09_01_world.sql
diff --git a/sql/updates/world/master/2023_07_12_00_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_07_12_00_world.sql
index 48fbe1b6dd5..48fbe1b6dd5 100644
--- a/sql/updates/world/master/2023_07_12_00_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_07_12_00_world.sql
diff --git a/sql/updates/world/master/2023_07_13_00_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_07_13_00_world.sql
index d46c6b9cf0a..d46c6b9cf0a 100644
--- a/sql/updates/world/master/2023_07_13_00_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_07_13_00_world.sql
diff --git a/sql/updates/world/master/2023_07_13_01_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_07_13_01_world.sql
index 4712ecaebd7..4712ecaebd7 100644
--- a/sql/updates/world/master/2023_07_13_01_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_07_13_01_world.sql
diff --git a/sql/updates/world/master/2023_07_13_02_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_07_13_02_world.sql
index 4b30cf28996..4b30cf28996 100644
--- a/sql/updates/world/master/2023_07_13_02_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_07_13_02_world.sql
diff --git a/sql/updates/world/master/2023_07_13_03_world.sql b/sql/old/10.x/world/23041_2023_07_14/2023_07_13_03_world.sql
index fb7b61af9b7..fb7b61af9b7 100644
--- a/sql/updates/world/master/2023_07_13_03_world.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_07_13_03_world.sql
diff --git a/sql/updates/world/master/2023_07_14_00_world_enUS.sql b/sql/old/10.x/world/23041_2023_07_14/2023_07_14_00_world_enUS.sql
index 8d41cc8d0f1..8d41cc8d0f1 100644
--- a/sql/updates/world/master/2023_07_14_00_world_enUS.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_07_14_00_world_enUS.sql
diff --git a/sql/updates/world/master/2023_07_14_01_world_esES.sql b/sql/old/10.x/world/23041_2023_07_14/2023_07_14_01_world_esES.sql
index 6a92747a6f3..6a92747a6f3 100644
--- a/sql/updates/world/master/2023_07_14_01_world_esES.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_07_14_01_world_esES.sql
diff --git a/sql/updates/world/master/2023_07_14_02_world_exMX.sql b/sql/old/10.x/world/23041_2023_07_14/2023_07_14_02_world_exMX.sql
index ad61514b806..ad61514b806 100644
--- a/sql/updates/world/master/2023_07_14_02_world_exMX.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_07_14_02_world_exMX.sql
diff --git a/sql/updates/world/master/2023_07_14_03_world_deDE.sql b/sql/old/10.x/world/23041_2023_07_14/2023_07_14_03_world_deDE.sql
index ddc5e1b25be..ddc5e1b25be 100644
--- a/sql/updates/world/master/2023_07_14_03_world_deDE.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_07_14_03_world_deDE.sql
diff --git a/sql/updates/world/master/2023_07_14_04_world_frFR.sql b/sql/old/10.x/world/23041_2023_07_14/2023_07_14_04_world_frFR.sql
index 7b9e40e1d81..7b9e40e1d81 100644
--- a/sql/updates/world/master/2023_07_14_04_world_frFR.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_07_14_04_world_frFR.sql
diff --git a/sql/updates/world/master/2023_07_14_05_world_itIT.sql b/sql/old/10.x/world/23041_2023_07_14/2023_07_14_05_world_itIT.sql
index 416dca93bc3..416dca93bc3 100644
--- a/sql/updates/world/master/2023_07_14_05_world_itIT.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_07_14_05_world_itIT.sql
diff --git a/sql/updates/world/master/2023_07_14_06_world_koKR.sql b/sql/old/10.x/world/23041_2023_07_14/2023_07_14_06_world_koKR.sql
index b374bacef02..b374bacef02 100644
--- a/sql/updates/world/master/2023_07_14_06_world_koKR.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_07_14_06_world_koKR.sql
diff --git a/sql/updates/world/master/2023_07_14_07_world_ptBR.sql b/sql/old/10.x/world/23041_2023_07_14/2023_07_14_07_world_ptBR.sql
index a07640b9349..a07640b9349 100644
--- a/sql/updates/world/master/2023_07_14_07_world_ptBR.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_07_14_07_world_ptBR.sql
diff --git a/sql/updates/world/master/2023_07_14_08_world_ruRU.sql b/sql/old/10.x/world/23041_2023_07_14/2023_07_14_08_world_ruRU.sql
index 5f19f76cbcf..5f19f76cbcf 100644
--- a/sql/updates/world/master/2023_07_14_08_world_ruRU.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_07_14_08_world_ruRU.sql
diff --git a/sql/updates/world/master/2023_07_14_09_world_zhCN.sql b/sql/old/10.x/world/23041_2023_07_14/2023_07_14_09_world_zhCN.sql
index 57917e54db2..57917e54db2 100644
--- a/sql/updates/world/master/2023_07_14_09_world_zhCN.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_07_14_09_world_zhCN.sql
diff --git a/sql/updates/world/master/2023_07_14_10_world_zhTW.sql b/sql/old/10.x/world/23041_2023_07_14/2023_07_14_10_world_zhTW.sql
index bb92149c3ab..bb92149c3ab 100644
--- a/sql/updates/world/master/2023_07_14_10_world_zhTW.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_07_14_10_world_zhTW.sql
diff --git a/sql/updates/world/master/2023_07_14_11_world_questpoi.sql b/sql/old/10.x/world/23041_2023_07_14/2023_07_14_11_world_questpoi.sql
index c0c7138e2a9..c0c7138e2a9 100644
--- a/sql/updates/world/master/2023_07_14_11_world_questpoi.sql
+++ b/sql/old/10.x/world/23041_2023_07_14/2023_07_14_11_world_questpoi.sql
diff --git a/sql/updates/auth/master/2023_07_14_00_auth.sql b/sql/updates/auth/master/2023_07_14_00_auth.sql
new file mode 100644
index 00000000000..2faf120d26a
--- /dev/null
+++ b/sql/updates/auth/master/2023_07_14_00_auth.sql
@@ -0,0 +1,3 @@
+-- TDB 1015.23071 auth
+UPDATE `updates` SET `state`='ARCHIVED',`speed`=0;
+REPLACE INTO `updates_include` (`path`, `state`) VALUES ('$/sql/old/10.x/auth', 'ARCHIVED');
diff --git a/sql/updates/characters/master/2023_07_14_00_characters.sql b/sql/updates/characters/master/2023_07_14_00_characters.sql
new file mode 100644
index 00000000000..19bc9715ae3
--- /dev/null
+++ b/sql/updates/characters/master/2023_07_14_00_characters.sql
@@ -0,0 +1,3 @@
+-- TDB 1015.23071 characters
+UPDATE `updates` SET `state`='ARCHIVED',`speed`=0;
+REPLACE INTO `updates_include` (`path`, `state`) VALUES ('$/sql/old/10.x/characters', 'ARCHIVED');
diff --git a/sql/updates/hotfixes/master/2023_07_14_11_hotfixes.sql b/sql/updates/hotfixes/master/2023_07_14_11_hotfixes.sql
new file mode 100644
index 00000000000..96e170bd005
--- /dev/null
+++ b/sql/updates/hotfixes/master/2023_07_14_11_hotfixes.sql
@@ -0,0 +1,3 @@
+-- TDB 1015.23071 hotfixes
+UPDATE `updates` SET `state`='ARCHIVED',`speed`=0;
+REPLACE INTO `updates_include` (`path`, `state`) VALUES ('$/sql/old/10.x/hotfixes', 'ARCHIVED');
diff --git a/sql/updates/world/master/2023_07_14_12_world.sql b/sql/updates/world/master/2023_07_14_12_world.sql
new file mode 100644
index 00000000000..61f352b1f40
--- /dev/null
+++ b/sql/updates/world/master/2023_07_14_12_world.sql
@@ -0,0 +1,4 @@
+-- TDB 1015.23071 world
+UPDATE `version` SET `db_version`='TDB 1015.23071', `cache_id`=23071 LIMIT 1;
+UPDATE `updates` SET `state`='ARCHIVED',`speed`=0;
+REPLACE INTO `updates_include` (`path`, `state`) VALUES ('$/sql/old/10.x/world', 'ARCHIVED');