469 files changed, 1330 insertions, 346 deletions

diff --git a/sql/base/auth_database.sql b/sql/base/auth_database.sql
index ec3346345ff..945a8ca21f3 100644
--- a/sql/base/auth_database.sql
+++ b/sql/base/auth_database.sql
@@ -1,8 +1,8 @@
--- MySQL dump 10.13  Distrib 5.7.30, for Linux (x86_64)
+-- MySQL dump 10.13  Distrib 5.7.34, for Linux (x86_64)
 --
 -- Host: localhost    Database: auth
 -- ------------------------------------------------------
--- Server version	5.7.30-0ubuntu0.18.04.1
+-- Server version	5.7.34
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -1193,10 +1193,10 @@ INSERT INTO `rbac_linked_permissions` VALUES
 (196,843),
 (196,866),
 (196,869),
-(196,872),
-(196,881),
 (196,870),
 (196,871),
+(196,872),
+(196,881),
 (197,232),
 (197,236),
 (197,237),
@@ -2335,13 +2335,13 @@ INSERT INTO `updates` VALUES
 ('2017_09_22_00_auth.sql','9313CCE80A18212E6F0C78D83316DE8582AE8084','ARCHIVED','2017-09-22 18:05:17',0),
 ('2017_10_13_00_auth.sql','87674E0D166AC60E3725B445714427892E42C6FE','ARCHIVED','2017-10-13 00:00:00',0),
 ('2017_11_11_01_auth.sql','0D6EDB6B2FC8B9FBDF11ECD79B4B8E943328B6A9','ARCHIVED','2017-11-11 18:49:45',0),
-('2017_12_17_00_auth.sql','2CD99730D4D32DBF0584CD5B1AA6F8F4AE3DA975','RELEASED','2017-12-17 00:00:00',0),
+('2017_12_17_00_auth.sql','2CD99730D4D32DBF0584CD5B1AA6F8F4AE3DA975','ARCHIVED','2017-12-17 00:00:00',0),
 ('2017_12_30_00_auth.sql','F360E9555AC68E28834E3FF807E4E37A090EF363','ARCHIVED','2017-12-30 00:23:32',0),
 ('2017_12_30_01_auth.sql','1E11C78BA6D1D8E8CED7423DF92D1D197D6061EE','ARCHIVED','2017-12-30 23:00:00',0),
 ('2017_12_31_00_auth.sql','1721ACBD35EB95FAE33B9E95F8C4E4B1FB70A5E4','ARCHIVED','2017-12-31 20:15:23',0),
 ('2018_01_02_00_auth.sql','CD9B826B9D95697DC412DEF780E814FA3991D6CD','ARCHIVED','2018-01-02 20:40:37',0),
-('2018_01_09_00_auth.sql','A5D4EC8FCFAB4F2DCE70EDCAD1ACBFB484FD68D5','RELEASED','2018-01-09 00:00:00',0),
-('2018_01_24_00_auth.sql','167B17D8A253D62A8112F8A7EB21C6E99CAEF1E4','RELEASED','2018-01-24 00:00:00',0),
+('2018_01_09_00_auth.sql','A5D4EC8FCFAB4F2DCE70EDCAD1ACBFB484FD68D5','ARCHIVED','2018-01-09 00:00:00',0),
+('2018_01_24_00_auth.sql','167B17D8A253D62A8112F8A7EB21C6E99CAEF1E4','ARCHIVED','2018-01-24 00:00:00',0),
 ('2018_02_18_00_auth.sql','8489DD3EFFE14A7486B593435F0BA2BC69B6EABF','ARCHIVED','2018-02-18 16:35:55',0),
 ('2018_02_19_00_auth.sql','07CE658C5EF88693D3C047EF8E724F94ADA74C15','ARCHIVED','2018-02-19 22:33:32',0),
 ('2018_02_28_00_auth.sql','E92EF4ABF7FA0C66649E1633DD0459F44C09EB83','ARCHIVED','2018-02-28 23:07:59',0),
@@ -2401,16 +2401,17 @@ INSERT INTO `updates` VALUES
 ('2020_08_26_00_auth.sql','D5EF787DECB41D898379588F101A0453B46F04D9','ARCHIVED','2020-08-26 21:00:34',0),
 ('2020_09_25_00_auth.sql','3CCA78EF89223724BA6784A4F3783DED30416637','ARCHIVED','2020-09-25 19:52:40',0),
 ('2020_10_20_00_auth.sql','1835C5EFD5816DEF914F27E867C8C8D5E08B3F68','ARCHIVED','2020-10-20 21:36:49',0),
-('2020_12_06_00_auth.sql','FA254400D3D7D53E9C350EABFEABFF4EC3AD40DA','RELEASED','2020-12-06 20:25:10',0),
-('2020_12_07_00_auth.sql','23626805735CB9BEEEBD756D4A39AFBCDA6E366C','RELEASED','2020-12-07 21:12:53',0),
-('2020_12_15_00_auth.sql','37DA3C4830ABA30C49370A8647F5B6B3E1821E57','RELEASED','2020-12-15 19:33:15',0),
-('2020_12_22_00_auth.sql','1AED5AD7D93C30CF75E62EBEBCC64FFEDC58F00A','RELEASED','2020-12-22 22:00:39',0),
-('2020_12_31_00_auth.sql','05C9C105D55C6588CDA0D75AE3B135B7E6B54C06','RELEASED','2020-12-31 12:58:21',0),
-('2021_01_10_00_auth.sql','4430F5CC9A31DBBEA4E437E980E9F26AC919C016','RELEASED','2021-01-10 12:29:57',0),
-('2021_01_13_00_auth.sql','F7C15519FFA0FE27EED859343B58714624A302E6','RELEASED','2021-01-13 11:19:52',0),
-('2021_02_09_00_auth.sql','F00ABFF6E3C3F5ACE3444C9D70BADC764C8B3CE2','RELEASED','2021-02-09 17:22:24',0),
-('2021_04_10_00_auth.sql','7B92AC4F76507940EF2257897F25304CF0F306EB','RELEASED','2021-04-10 19:42:42',0),
-('2021_05_12_00_auth.sql','7F37DAD1777D62FDB00C19C0DF5E7DB742CCD5AD','RELEASED','2021-05-12 01:08:42',0);
+('2020_12_06_00_auth.sql','FA254400D3D7D53E9C350EABFEABFF4EC3AD40DA','ARCHIVED','2020-12-06 20:25:10',0),
+('2020_12_07_00_auth.sql','23626805735CB9BEEEBD756D4A39AFBCDA6E366C','ARCHIVED','2020-12-07 21:12:53',0),
+('2020_12_15_00_auth.sql','37DA3C4830ABA30C49370A8647F5B6B3E1821E57','ARCHIVED','2020-12-15 19:33:15',0),
+('2020_12_22_00_auth.sql','1AED5AD7D93C30CF75E62EBEBCC64FFEDC58F00A','ARCHIVED','2020-12-22 22:00:39',0),
+('2020_12_31_00_auth.sql','05C9C105D55C6588CDA0D75AE3B135B7E6B54C06','ARCHIVED','2020-12-31 12:58:21',0),
+('2021_01_10_00_auth.sql','4430F5CC9A31DBBEA4E437E980E9F26AC919C016','ARCHIVED','2021-01-10 12:29:57',0),
+('2021_01_13_00_auth.sql','F7C15519FFA0FE27EED859343B58714624A302E6','ARCHIVED','2021-01-13 11:19:52',0),
+('2021_02_09_00_auth.sql','F00ABFF6E3C3F5ACE3444C9D70BADC764C8B3CE2','ARCHIVED','2021-02-09 17:22:24',0),
+('2021_04_10_00_auth.sql','7B92AC4F76507940EF2257897F25304CF0F306EB','ARCHIVED','2021-04-10 19:42:42',0),
+('2021_05_12_00_auth.sql','7F37DAD1777D62FDB00C19C0DF5E7DB742CCD5AD','ARCHIVED','2021-05-12 01:08:42',0),
+('2021_07_04_00_auth.sql','3CF056F8F04E49C1E236060202AA8DA7E186B590','ARCHIVED','2021-07-04 22:23:24',0);
 /*!40000 ALTER TABLE `updates` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -2439,7 +2440,8 @@ INSERT INTO `updates_include` VALUES
 ('$/sql/custom/auth','RELEASED'),
 ('$/sql/old/6.x/auth','ARCHIVED'),
 ('$/sql/old/7/auth','ARCHIVED'),
-('$/sql/old/8.x/auth','ARCHIVED');
+('$/sql/old/8.x/auth','ARCHIVED'),
+('$/sql/old/9.x/auth','ARCHIVED');
 /*!40000 ALTER TABLE `updates_include` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -2482,4 +2484,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2020-10-20 21:36:50
+-- Dump completed on 2021-07-04 22:23:25
diff --git a/sql/base/characters_database.sql b/sql/base/characters_database.sql
index 280477bb168..a800bb96f9e 100644
--- a/sql/base/characters_database.sql
+++ b/sql/base/characters_database.sql
@@ -1,8 +1,8 @@
--- MySQL dump 10.13  Distrib 5.7.30, for Linux (x86_64)
+-- MySQL dump 10.13  Distrib 5.7.34, for Linux (x86_64)
 --
 -- Host: localhost    Database: characters
 -- ------------------------------------------------------
--- Server version	5.7.30-0ubuntu0.18.04.1
+-- Server version	5.7.34
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -735,6 +735,7 @@ UNLOCK TABLES;
 --
 -- Table structure for table `character_customizations`
 --
+
 DROP TABLE IF EXISTS `character_customizations`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
@@ -3851,12 +3852,13 @@ INSERT INTO `updates` VALUES
 ('2020_06_17_00_characters.sql','C3EE0D751E4B97CDF15F3BE27AAAE3646514A358','ARCHIVED','2020-06-17 17:04:56',0),
 ('2020_08_14_00_characters.sql','355685FF86EE64E2ED9D4B7D1311D53A9C2E0FA5','ARCHIVED','2020-08-14 21:41:24',0),
 ('2020_10_20_00_characters.sql','744F2A36865761920CE98A6DDE3A3BADF44D1E77','ARCHIVED','2020-10-20 21:36:49',0),
-('2020_11_16_00_characters.sql','33D5C7539E239132923D01F4B6EAD5F3EF3EEB69','RELEASED','2020-11-16 19:16:31',0),
-('2020_12_13_00_characters.sql','6AC743240033DED2C402ECB894A59D79EF607920','RELEASED','2020-12-13 18:36:58',0),
-('2021_03_27_00_characters_aura_stored_location.sql','BF772ABC2DF186AF0A5DC56D5E824A2F4813BA69','RELEASED','2021-03-27 15:53:04',0),
-('2021_04_05_00_characters.sql','33D656995E0F3578FFE1A658ED1692CA5310AB30','RELEASED','2021-04-05 23:44:54',0),
-('2021_05_10_00_characters.sql','0A406242BC18BDA5A65CDE3E2AFEE760D79F819F','RELEASED','2021-05-10 23:30:34',0),
-('2021_05_11_00_characters.sql','C3F0337CE8363F970AB4FDB9D23BBB7C650A0B0E','RELEASED','2021-05-11 15:39:26',0);
+('2020_11_16_00_characters.sql','33D5C7539E239132923D01F4B6EAD5F3EF3EEB69','ARCHIVED','2020-11-16 19:16:31',0),
+('2020_12_13_00_characters.sql','6AC743240033DED2C402ECB894A59D79EF607920','ARCHIVED','2020-12-13 18:36:58',0),
+('2021_03_27_00_characters_aura_stored_location.sql','BF772ABC2DF186AF0A5DC56D5E824A2F4813BA69','ARCHIVED','2021-03-27 15:53:04',0),
+('2021_04_05_00_characters.sql','33D656995E0F3578FFE1A658ED1692CA5310AB30','ARCHIVED','2021-04-05 23:44:54',0),
+('2021_05_10_00_characters.sql','0A406242BC18BDA5A65CDE3E2AFEE760D79F819F','ARCHIVED','2021-05-10 23:30:34',0),
+('2021_05_11_00_characters.sql','C3F0337CE8363F970AB4FDB9D23BBB7C650A0B0E','ARCHIVED','2021-05-11 15:39:26',0),
+('2021_07_04_00_characters.sql','E0E7AD664DDB553E96B457DD9ED8976665E94007','ARCHIVED','2021-07-04 22:23:24',0);
 /*!40000 ALTER TABLE `updates` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -3885,7 +3887,8 @@ INSERT INTO `updates_include` VALUES
 ('$/sql/custom/characters','RELEASED'),
 ('$/sql/old/6.x/characters','ARCHIVED'),
 ('$/sql/old/7/characters','ARCHIVED'),
-('$/sql/old/8.x/characters','ARCHIVED');
+('$/sql/old/8.x/characters','ARCHIVED'),
+('$/sql/old/9.x/characters','ARCHIVED');
 /*!40000 ALTER TABLE `updates_include` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -3954,4 +3957,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2020-10-20 21:36:52
+-- Dump completed on 2021-07-04 22:23:26
diff --git a/sql/base/dev/hotfixes_database.sql b/sql/base/dev/hotfixes_database.sql
index 31ffa49d357..08d014c7bfd 100644
--- a/sql/base/dev/hotfixes_database.sql
+++ b/sql/base/dev/hotfixes_database.sql
@@ -1,8 +1,8 @@
--- MySQL dump 10.13  Distrib 5.7.30, for Linux (x86_64)
+-- MySQL dump 10.13  Distrib 5.7.34, for Linux (x86_64)
 --
 -- Host: localhost    Database: hotfixes
 -- ------------------------------------------------------
--- Server version	5.7.30-0ubuntu0.18.04.1
+-- Server version	5.7.34
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -39,12 +39,57 @@ CREATE TABLE `achievement` (
   `RewardItemID` int(11) NOT NULL DEFAULT '0',
   `CriteriaTree` int(10) unsigned NOT NULL DEFAULT '0',
   `SharesCriteria` smallint(6) NOT NULL DEFAULT '0',
+  `CovenantID` int(11) NOT NULL DEFAULT '0',
   `VerifiedBuild` int(11) 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 `achievement_category`
+--
+
+DROP TABLE IF EXISTS `achievement_category`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `achievement_category` (
+  `Name` text COLLATE utf8mb4_unicode_ci,
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Parent` smallint(6) NOT NULL DEFAULT '0',
+  `UiOrder` tinyint(4) NOT NULL DEFAULT '0',
+  `VerifiedBuild` int(11) 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 `achievement_category_locale`
+--
+
+DROP TABLE IF EXISTS `achievement_category_locale`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `achievement_category_locale` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `locale` varchar(4) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `Name_lang` text COLLATE utf8mb4_unicode_ci,
+  `VerifiedBuild` int(11) 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 `achievement_locale`
 --
 
@@ -74,6 +119,130 @@ CREATE TABLE `achievement_locale` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `adventure_journal`
+--
+
+DROP TABLE IF EXISTS `adventure_journal`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `adventure_journal` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Name` text COLLATE utf8mb4_unicode_ci,
+  `Description` text COLLATE utf8mb4_unicode_ci,
+  `ButtonText` text COLLATE utf8mb4_unicode_ci,
+  `RewardDescription` text COLLATE utf8mb4_unicode_ci,
+  `ContinueDescription` text COLLATE utf8mb4_unicode_ci,
+  `Type` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `PlayerConditionID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Flags` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `ButtonActionType` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `TextureFileDataID` int(11) NOT NULL DEFAULT '0',
+  `LfgDungeonID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `QuestID` int(11) NOT NULL DEFAULT '0',
+  `BattleMasterListID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `PriorityMin` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `PriorityMax` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `ItemID` int(11) NOT NULL DEFAULT '0',
+  `ItemQuantity` int(10) unsigned NOT NULL DEFAULT '0',
+  `CurrencyType` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `CurrencyQuantity` int(10) unsigned NOT NULL DEFAULT '0',
+  `UiMapID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `BonusPlayerConditionID1` int(10) unsigned NOT NULL DEFAULT '0',
+  `BonusPlayerConditionID2` int(10) unsigned NOT NULL DEFAULT '0',
+  `BonusValue1` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `BonusValue2` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` int(11) 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 `adventure_journal_locale`
+--
+
+DROP TABLE IF EXISTS `adventure_journal_locale`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `adventure_journal_locale` (
+  `ID` int(10) 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,
+  `ButtonText_lang` text COLLATE utf8mb4_unicode_ci,
+  `RewardDescription_lang` text COLLATE utf8mb4_unicode_ci,
+  `ContinueDescription_lang` text COLLATE utf8mb4_unicode_ci,
+  `VerifiedBuild` int(11) 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 `adventure_map_poi`
+--
+
+DROP TABLE IF EXISTS `adventure_map_poi`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `adventure_map_poi` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Title` text COLLATE utf8mb4_unicode_ci,
+  `Description` text COLLATE utf8mb4_unicode_ci,
+  `WorldPositionX` float NOT NULL DEFAULT '0',
+  `WorldPositionY` float NOT NULL DEFAULT '0',
+  `Type` tinyint(4) NOT NULL DEFAULT '0',
+  `PlayerConditionID` int(10) unsigned NOT NULL DEFAULT '0',
+  `QuestID` int(10) unsigned NOT NULL DEFAULT '0',
+  `LfgDungeonID` int(10) unsigned NOT NULL DEFAULT '0',
+  `RewardItemID` int(11) NOT NULL DEFAULT '0',
+  `UiTextureAtlasMemberID` int(10) unsigned NOT NULL DEFAULT '0',
+  `UiTextureKitID` int(10) unsigned NOT NULL DEFAULT '0',
+  `MapID` int(11) NOT NULL DEFAULT '0',
+  `AreaTableID` int(10) unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` int(11) 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 `adventure_map_poi_locale`
+--
+
+DROP TABLE IF EXISTS `adventure_map_poi_locale`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `adventure_map_poi_locale` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `locale` varchar(4) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `Title_lang` text COLLATE utf8mb4_unicode_ci,
+  `Description_lang` text COLLATE utf8mb4_unicode_ci,
+  `VerifiedBuild` int(11) 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 `anim_kit`
 --
 
@@ -145,7 +314,6 @@ CREATE TABLE `area_table` (
   `UwAmbience` smallint(5) unsigned NOT NULL DEFAULT '0',
   `ZoneMusic` smallint(5) unsigned NOT NULL DEFAULT '0',
   `UwZoneMusic` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `ExplorationLevel` tinyint(4) NOT NULL DEFAULT '0',
   `IntroSound` smallint(5) unsigned NOT NULL DEFAULT '0',
   `UwIntroSound` int(10) unsigned NOT NULL DEFAULT '0',
   `FactionGroupMask` tinyint(3) unsigned NOT NULL DEFAULT '0',
@@ -155,6 +323,7 @@ CREATE TABLE `area_table` (
   `WildBattlePetLevelMin` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `WildBattlePetLevelMax` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `WindSettingsID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `ContentTuningID` int(11) NOT NULL DEFAULT '0',
   `Flags1` int(11) NOT NULL DEFAULT '0',
   `Flags2` int(11) NOT NULL DEFAULT '0',
   `LiquidTypeID1` smallint(5) unsigned NOT NULL DEFAULT '0',
@@ -965,7 +1134,7 @@ DROP TABLE IF EXISTS `battle_pet_breed_state`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `battle_pet_breed_state` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `BattlePetStateID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `BattlePetStateID` int(11) NOT NULL DEFAULT '0',
   `Value` smallint(5) unsigned NOT NULL DEFAULT '0',
   `BattlePetBreedID` int(10) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` int(11) NOT NULL DEFAULT '0',
@@ -992,6 +1161,7 @@ CREATE TABLE `battle_pet_species` (
   `SourceTypeEnum` tinyint(4) NOT NULL DEFAULT '0',
   `CardUIModelSceneID` int(11) NOT NULL DEFAULT '0',
   `LoadoutUIModelSceneID` int(11) NOT NULL DEFAULT '0',
+  `CovenantID` int(11) NOT NULL DEFAULT '0',
   `VerifiedBuild` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`,`VerifiedBuild`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
@@ -1064,9 +1234,9 @@ CREATE TABLE `battlemaster_list` (
   `GroupsAllowed` tinyint(4) NOT NULL DEFAULT '0',
   `MaxGroupSize` tinyint(4) NOT NULL DEFAULT '0',
   `HolidayWorldState` smallint(6) NOT NULL DEFAULT '0',
-  `Flags` tinyint(4) NOT NULL DEFAULT '0',
+  `Flags` int(11) NOT NULL DEFAULT '0',
   `IconFileDataID` int(11) NOT NULL DEFAULT '0',
-  `RequiredPlayerConditionID` smallint(6) NOT NULL DEFAULT '0',
+  `RequiredPlayerConditionID` int(11) NOT NULL DEFAULT '0',
   `MapID1` smallint(6) NOT NULL DEFAULT '0',
   `MapID2` smallint(6) NOT NULL DEFAULT '0',
   `MapID3` smallint(6) NOT NULL DEFAULT '0',
@@ -1129,7 +1299,7 @@ CREATE TABLE `broadcast_text` (
   `Text` text COLLATE utf8mb4_unicode_ci,
   `Text1` text COLLATE utf8mb4_unicode_ci,
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `LanguageID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `LanguageID` int(11) NOT NULL DEFAULT '0',
   `ConditionID` int(11) NOT NULL DEFAULT '0',
   `EmotesID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `Flags` tinyint(3) unsigned NOT NULL DEFAULT '0',
@@ -1195,90 +1365,6 @@ CREATE TABLE `cfg_regions` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
--- Table structure for table `char_base_section`
---
-
-DROP TABLE IF EXISTS `char_base_section`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `char_base_section` (
-  `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `LayoutResType` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `VariationEnum` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `ResolutionVariationEnum` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `VerifiedBuild` int(11) 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_sections`
---
-
-DROP TABLE IF EXISTS `char_sections`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `char_sections` (
-  `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `RaceID` tinyint(4) NOT NULL DEFAULT '0',
-  `SexID` tinyint(4) NOT NULL DEFAULT '0',
-  `BaseSection` tinyint(4) NOT NULL DEFAULT '0',
-  `VariationIndex` tinyint(4) NOT NULL DEFAULT '0',
-  `ColorIndex` tinyint(4) NOT NULL DEFAULT '0',
-  `Flags` smallint(6) NOT NULL DEFAULT '0',
-  `MaterialResourcesID1` int(11) NOT NULL DEFAULT '0',
-  `MaterialResourcesID2` int(11) NOT NULL DEFAULT '0',
-  `MaterialResourcesID3` int(11) NOT NULL DEFAULT '0',
-  `VerifiedBuild` int(11) 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_start_outfit`
---
-
-DROP TABLE IF EXISTS `char_start_outfit`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `char_start_outfit` (
-  `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `ClassID` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `SexID` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `OutfitID` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `PetDisplayID` int(10) unsigned NOT NULL DEFAULT '0',
-  `PetFamilyID` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `ItemID1` int(11) NOT NULL DEFAULT '0',
-  `ItemID2` int(11) NOT NULL DEFAULT '0',
-  `ItemID3` int(11) NOT NULL DEFAULT '0',
-  `ItemID4` int(11) NOT NULL DEFAULT '0',
-  `ItemID5` int(11) NOT NULL DEFAULT '0',
-  `ItemID6` int(11) NOT NULL DEFAULT '0',
-  `ItemID7` int(11) NOT NULL DEFAULT '0',
-  `ItemID8` int(11) NOT NULL DEFAULT '0',
-  `ItemID9` int(11) NOT NULL DEFAULT '0',
-  `ItemID10` int(11) NOT NULL DEFAULT '0',
-  `ItemID11` int(11) NOT NULL DEFAULT '0',
-  `ItemID12` int(11) NOT NULL DEFAULT '0',
-  `ItemID13` int(11) NOT NULL DEFAULT '0',
-  `ItemID14` int(11) NOT NULL DEFAULT '0',
-  `ItemID15` int(11) NOT NULL DEFAULT '0',
-  `ItemID16` int(11) NOT NULL DEFAULT '0',
-  `ItemID17` int(11) NOT NULL DEFAULT '0',
-  `ItemID18` int(11) NOT NULL DEFAULT '0',
-  `ItemID19` int(11) NOT NULL DEFAULT '0',
-  `ItemID20` int(11) NOT NULL DEFAULT '0',
-  `ItemID21` int(11) NOT NULL DEFAULT '0',
-  `ItemID22` int(11) NOT NULL DEFAULT '0',
-  `ItemID23` int(11) NOT NULL DEFAULT '0',
-  `ItemID24` int(11) NOT NULL DEFAULT '0',
-  `RaceID` int(10) unsigned NOT NULL DEFAULT '0',
-  `VerifiedBuild` int(11) 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`
 --
 
@@ -1325,22 +1411,33 @@ CREATE TABLE `char_titles_locale` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
--- Table structure for table `character_facial_hair_styles`
+-- Table structure for table `character_loadout`
 --
 
-DROP TABLE IF EXISTS `character_facial_hair_styles`;
+DROP TABLE IF EXISTS `character_loadout`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `character_facial_hair_styles` (
+CREATE TABLE `character_loadout` (
+  `RaceMask` bigint(20) NOT NULL DEFAULT '0',
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `Geoset1` int(11) NOT NULL DEFAULT '0',
-  `Geoset2` int(11) NOT NULL DEFAULT '0',
-  `Geoset3` int(11) NOT NULL DEFAULT '0',
-  `Geoset4` int(11) NOT NULL DEFAULT '0',
-  `Geoset5` int(11) NOT NULL DEFAULT '0',
-  `RaceID` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `SexID` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `VariationID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `ChrClassID` tinyint(4) NOT NULL DEFAULT '0',
+  `Purpose` tinyint(4) NOT NULL DEFAULT '0',
+  `VerifiedBuild` int(11) 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 `character_loadout_item`
+--
+
+DROP TABLE IF EXISTS `character_loadout_item`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `character_loadout_item` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `CharacterLoadoutID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `ItemID` int(10) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`,`VerifiedBuild`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
@@ -1354,11 +1451,12 @@ DROP TABLE IF EXISTS `chat_channels`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `chat_channels` (
-  `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `Name` text COLLATE utf8mb4_unicode_ci,
   `Shortcut` text COLLATE utf8mb4_unicode_ci,
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `Flags` int(11) NOT NULL DEFAULT '0',
   `FactionGroup` tinyint(4) NOT NULL DEFAULT '0',
+  `Ruleset` int(11) NOT NULL DEFAULT '0',
   `VerifiedBuild` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`,`VerifiedBuild`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
@@ -1393,6 +1491,23 @@ CREATE TABLE `chat_channels_locale` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `chr_class_ui_display`
+--
+
+DROP TABLE IF EXISTS `chr_class_ui_display`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `chr_class_ui_display` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `ChrClassesID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `AdvGuidePlayerConditionID` int(10) unsigned NOT NULL DEFAULT '0',
+  `SplashPlayerConditionID` int(10) unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` int(11) 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 `chr_classes`
 --
 
@@ -1405,14 +1520,29 @@ CREATE TABLE `chr_classes` (
   `NameMale` text COLLATE utf8mb4_unicode_ci,
   `NameFemale` text COLLATE utf8mb4_unicode_ci,
   `PetNameToken` text COLLATE utf8mb4_unicode_ci,
+  `Description` text COLLATE utf8mb4_unicode_ci,
+  `RoleInfoString` text COLLATE utf8mb4_unicode_ci,
+  `DisabledString` text COLLATE utf8mb4_unicode_ci,
+  `HyphenatedNameMale` text COLLATE utf8mb4_unicode_ci,
+  `HyphenatedNameFemale` text COLLATE utf8mb4_unicode_ci,
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `CreateScreenFileDataID` int(10) unsigned NOT NULL DEFAULT '0',
   `SelectScreenFileDataID` int(10) unsigned NOT NULL DEFAULT '0',
   `IconFileDataID` int(10) unsigned NOT NULL DEFAULT '0',
   `LowResScreenFileDataID` int(10) unsigned NOT NULL DEFAULT '0',
-  `StartingLevel` int(11) NOT NULL DEFAULT '0',
+  `Flags` int(10) unsigned NOT NULL DEFAULT '0',
   `SpellTextureBlobFileDataID` int(10) unsigned NOT NULL DEFAULT '0',
-  `Flags` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `RolesMask` int(10) unsigned NOT NULL DEFAULT '0',
+  `ArmorTypeMask` int(10) unsigned NOT NULL DEFAULT '0',
+  `CharStartKitUnknown901` int(11) NOT NULL DEFAULT '0',
+  `MaleCharacterCreationVisualFallback` int(11) NOT NULL DEFAULT '0',
+  `MaleCharacterCreationIdleVisualFallback` int(11) NOT NULL DEFAULT '0',
+  `FemaleCharacterCreationVisualFallback` int(11) NOT NULL DEFAULT '0',
+  `FemaleCharacterCreationIdleVisualFallback` int(11) NOT NULL DEFAULT '0',
+  `CharacterCreationIdleGroundVisualFallback` int(11) NOT NULL DEFAULT '0',
+  `CharacterCreationGroundVisualFallback` int(11) NOT NULL DEFAULT '0',
+  `AlteredFormCharacterCreationIdleVisualFallback` int(11) NOT NULL DEFAULT '0',
+  `CharacterCreationAnimLoopWaitTimeMsFallback` int(11) NOT NULL DEFAULT '0',
   `CinematicSequenceID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `DefaultSpec` smallint(5) unsigned NOT NULL DEFAULT '0',
   `PrimaryStatPriority` tinyint(3) unsigned NOT NULL DEFAULT '0',
@@ -1421,6 +1551,9 @@ CREATE TABLE `chr_classes` (
   `AttackPowerPerAgility` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `AttackPowerPerStrength` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `SpellClassSet` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `ChatColorR` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `ChatColorG` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `ChatColorB` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`,`VerifiedBuild`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
@@ -1439,6 +1572,11 @@ CREATE TABLE `chr_classes_locale` (
   `Name_lang` text COLLATE utf8mb4_unicode_ci,
   `NameMale_lang` text COLLATE utf8mb4_unicode_ci,
   `NameFemale_lang` text COLLATE utf8mb4_unicode_ci,
+  `Description_lang` text COLLATE utf8mb4_unicode_ci,
+  `RoleInfoString_lang` text COLLATE utf8mb4_unicode_ci,
+  `DisabledString_lang` text COLLATE utf8mb4_unicode_ci,
+  `HyphenatedNameMale_lang` text COLLATE utf8mb4_unicode_ci,
+  `HyphenatedNameFemale_lang` text COLLATE utf8mb4_unicode_ci,
   `VerifiedBuild` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`,`locale`,`VerifiedBuild`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci
@@ -1472,6 +1610,232 @@ CREATE TABLE `chr_classes_x_power_types` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `chr_customization_choice`
+--
+
+DROP TABLE IF EXISTS `chr_customization_choice`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `chr_customization_choice` (
+  `Name` text COLLATE utf8mb4_unicode_ci,
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `ChrCustomizationOptionID` int(11) NOT NULL DEFAULT '0',
+  `ChrCustomizationReqID` int(11) NOT NULL DEFAULT '0',
+  `SortOrder` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `SwatchColor1` int(11) NOT NULL DEFAULT '0',
+  `SwatchColor2` int(11) NOT NULL DEFAULT '0',
+  `UiOrderIndex` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Flags` int(11) NOT NULL DEFAULT '0',
+  `VerifiedBuild` int(11) 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 `chr_customization_choice_locale`
+--
+
+DROP TABLE IF EXISTS `chr_customization_choice_locale`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `chr_customization_choice_locale` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `locale` varchar(4) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `Name_lang` text COLLATE utf8mb4_unicode_ci,
+  `VerifiedBuild` int(11) 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 `chr_customization_display_info`
+--
+
+DROP TABLE IF EXISTS `chr_customization_display_info`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `chr_customization_display_info` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `ShapeshiftFormID` int(11) NOT NULL DEFAULT '0',
+  `DisplayID` int(11) NOT NULL DEFAULT '0',
+  `BarberShopMinCameraDistance` float NOT NULL DEFAULT '0',
+  `BarberShopHeightOffset` float NOT NULL DEFAULT '0',
+  `VerifiedBuild` int(11) 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 `chr_customization_element`
+--
+
+DROP TABLE IF EXISTS `chr_customization_element`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `chr_customization_element` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `ChrCustomizationChoiceID` int(11) NOT NULL DEFAULT '0',
+  `RelatedChrCustomizationChoiceID` int(11) NOT NULL DEFAULT '0',
+  `ChrCustomizationGeosetID` int(11) NOT NULL DEFAULT '0',
+  `ChrCustomizationSkinnedModelID` int(11) NOT NULL DEFAULT '0',
+  `ChrCustomizationMaterialID` int(11) NOT NULL DEFAULT '0',
+  `ChrCustomizationBoneSetID` int(11) NOT NULL DEFAULT '0',
+  `ChrCustomizationCondModelID` int(11) NOT NULL DEFAULT '0',
+  `ChrCustomizationDisplayInfoID` int(11) NOT NULL DEFAULT '0',
+  `ChrCustItemGeoModifyID` int(11) NOT NULL DEFAULT '0',
+  `VerifiedBuild` int(11) 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 `chr_customization_option`
+--
+
+DROP TABLE IF EXISTS `chr_customization_option`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `chr_customization_option` (
+  `Name` text COLLATE utf8mb4_unicode_ci,
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `SecondaryID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Flags` int(11) NOT NULL DEFAULT '0',
+  `ChrModelID` int(11) NOT NULL DEFAULT '0',
+  `SortIndex` int(11) NOT NULL DEFAULT '0',
+  `ChrCustomizationCategoryID` int(11) NOT NULL DEFAULT '0',
+  `OptionType` int(11) NOT NULL DEFAULT '0',
+  `BarberShopCostModifier` float NOT NULL DEFAULT '0',
+  `ChrCustomizationID` int(11) NOT NULL DEFAULT '0',
+  `ChrCustomizationReqID` int(11) NOT NULL DEFAULT '0',
+  `UiOrderIndex` int(11) NOT NULL DEFAULT '0',
+  `VerifiedBuild` int(11) 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 `chr_customization_option_locale`
+--
+
+DROP TABLE IF EXISTS `chr_customization_option_locale`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `chr_customization_option_locale` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `locale` varchar(4) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `Name_lang` text COLLATE utf8mb4_unicode_ci,
+  `VerifiedBuild` int(11) 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 `chr_customization_req`
+--
+
+DROP TABLE IF EXISTS `chr_customization_req`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `chr_customization_req` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Flags` int(11) NOT NULL DEFAULT '0',
+  `ClassMask` int(11) NOT NULL DEFAULT '0',
+  `AchievementID` int(11) NOT NULL DEFAULT '0',
+  `OverrideArchive` int(11) NOT NULL DEFAULT '0',
+  `ItemModifiedAppearanceID` int(11) NOT NULL DEFAULT '0',
+  `VerifiedBuild` int(11) 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 `chr_customization_req_choice`
+--
+
+DROP TABLE IF EXISTS `chr_customization_req_choice`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `chr_customization_req_choice` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `ChrCustomizationChoiceID` int(11) NOT NULL DEFAULT '0',
+  `ChrCustomizationReqID` int(10) unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` int(11) 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 `chr_model`
+--
+
+DROP TABLE IF EXISTS `chr_model`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `chr_model` (
+  `FaceCustomizationOffset1` float NOT NULL DEFAULT '0',
+  `FaceCustomizationOffset2` float NOT NULL DEFAULT '0',
+  `FaceCustomizationOffset3` float NOT NULL DEFAULT '0',
+  `CustomizeOffset1` float NOT NULL DEFAULT '0',
+  `CustomizeOffset2` float NOT NULL DEFAULT '0',
+  `CustomizeOffset3` float NOT NULL DEFAULT '0',
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Sex` int(11) NOT NULL DEFAULT '0',
+  `DisplayID` int(11) NOT NULL DEFAULT '0',
+  `CharComponentTextureLayoutID` int(11) NOT NULL DEFAULT '0',
+  `Flags` int(11) NOT NULL DEFAULT '0',
+  `SkeletonFileDataID` int(11) NOT NULL DEFAULT '0',
+  `ModelFallbackChrModelID` int(11) NOT NULL DEFAULT '0',
+  `TextureFallbackChrModelID` int(11) NOT NULL DEFAULT '0',
+  `HelmVisFallbackChrModelID` int(11) NOT NULL DEFAULT '0',
+  `CustomizeScale` float NOT NULL DEFAULT '0',
+  `CustomizeFacing` float NOT NULL DEFAULT '0',
+  `CameraDistanceOffset` float NOT NULL DEFAULT '0',
+  `BarberShopCameraOffsetScale` float NOT NULL DEFAULT '0',
+  `BarberShopCameraRotationOffset` float NOT NULL DEFAULT '0',
+  `VerifiedBuild` int(11) 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 `chr_race_x_chr_model`
+--
+
+DROP TABLE IF EXISTS `chr_race_x_chr_model`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `chr_race_x_chr_model` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `ChrRacesID` int(11) NOT NULL DEFAULT '0',
+  `ChrModelID` int(11) NOT NULL DEFAULT '0',
+  `VerifiedBuild` int(11) 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 `chr_races`
 --
 
@@ -1485,20 +1849,22 @@ CREATE TABLE `chr_races` (
   `NameFemale` text COLLATE utf8mb4_unicode_ci,
   `NameLowercase` text COLLATE utf8mb4_unicode_ci,
   `NameFemaleLowercase` text COLLATE utf8mb4_unicode_ci,
+  `NameS` text COLLATE utf8mb4_unicode_ci,
+  `NameFemaleS` text COLLATE utf8mb4_unicode_ci,
+  `NameLowercaseS` text COLLATE utf8mb4_unicode_ci,
+  `NameFemaleLowercaseS` text COLLATE utf8mb4_unicode_ci,
+  `RaceFantasyDescription` text COLLATE utf8mb4_unicode_ci,
+  `NameL` text COLLATE utf8mb4_unicode_ci,
+  `NameFemaleL` text COLLATE utf8mb4_unicode_ci,
+  `NameLowercaseL` text COLLATE utf8mb4_unicode_ci,
+  `NameFemaleLowercaseL` text COLLATE utf8mb4_unicode_ci,
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `Flags` int(11) NOT NULL DEFAULT '0',
-  `MaleDisplayId` int(10) unsigned NOT NULL DEFAULT '0',
-  `FemaleDisplayId` int(10) unsigned NOT NULL DEFAULT '0',
-  `HighResMaleDisplayId` int(10) unsigned NOT NULL DEFAULT '0',
-  `HighResFemaleDisplayId` int(10) unsigned NOT NULL DEFAULT '0',
+  `BaseLanguage` int(11) NOT NULL DEFAULT '0',
+  `ResSicknessSpellID` int(11) NOT NULL DEFAULT '0',
+  `SplashSoundID` int(11) NOT NULL DEFAULT '0',
   `CreateScreenFileDataID` int(11) NOT NULL DEFAULT '0',
   `SelectScreenFileDataID` int(11) NOT NULL DEFAULT '0',
-  `MaleCustomizeOffset1` float NOT NULL DEFAULT '0',
-  `MaleCustomizeOffset2` float NOT NULL DEFAULT '0',
-  `MaleCustomizeOffset3` float NOT NULL DEFAULT '0',
-  `FemaleCustomizeOffset1` float NOT NULL DEFAULT '0',
-  `FemaleCustomizeOffset2` float NOT NULL DEFAULT '0',
-  `FemaleCustomizeOffset3` float NOT NULL DEFAULT '0',
   `LowResScreenFileDataID` int(11) NOT NULL DEFAULT '0',
   `AlteredFormStartVisualKitID1` int(10) unsigned NOT NULL DEFAULT '0',
   `AlteredFormStartVisualKitID2` int(10) unsigned NOT NULL DEFAULT '0',
@@ -1509,21 +1875,19 @@ CREATE TABLE `chr_races` (
   `HeritageArmorAchievementID` int(11) NOT NULL DEFAULT '0',
   `StartingLevel` int(11) NOT NULL DEFAULT '0',
   `UiDisplayOrder` int(11) NOT NULL DEFAULT '0',
-  `FemaleSkeletonFileDataID` int(11) NOT NULL DEFAULT '0',
-  `MaleSkeletonFileDataID` int(11) NOT NULL DEFAULT '0',
-  `HelmVisFallbackRaceID` int(11) NOT NULL DEFAULT '0',
+  `PlayableRaceBit` int(11) NOT NULL DEFAULT '0',
+  `HelmetAnimScalingRaceID` int(11) NOT NULL DEFAULT '0',
   `TransmogrifyDisabledSlotMask` int(11) NOT NULL DEFAULT '0',
+  `AlteredFormCustomizeOffsetFallback1` float NOT NULL DEFAULT '0',
+  `AlteredFormCustomizeOffsetFallback2` float NOT NULL DEFAULT '0',
+  `AlteredFormCustomizeOffsetFallback3` float NOT NULL DEFAULT '0',
+  `AlteredFormCustomizeRotationFallback` float NOT NULL DEFAULT '0',
   `FactionID` smallint(6) NOT NULL DEFAULT '0',
   `CinematicSequenceID` smallint(6) NOT NULL DEFAULT '0',
-  `ResSicknessSpellID` smallint(6) NOT NULL DEFAULT '0',
-  `SplashSoundID` smallint(6) NOT NULL DEFAULT '0',
-  `BaseLanguage` tinyint(4) NOT NULL DEFAULT '0',
   `CreatureType` tinyint(4) NOT NULL DEFAULT '0',
   `Alliance` tinyint(4) NOT NULL DEFAULT '0',
   `RaceRelated` tinyint(4) NOT NULL DEFAULT '0',
   `UnalteredVisualRaceID` tinyint(4) NOT NULL DEFAULT '0',
-  `CharComponentTextureLayoutID` tinyint(4) NOT NULL DEFAULT '0',
-  `CharComponentTexLayoutHiResID` tinyint(4) NOT NULL DEFAULT '0',
   `DefaultClassID` tinyint(4) NOT NULL DEFAULT '0',
   `NeutralRaceID` tinyint(4) NOT NULL DEFAULT '0',
   `MaleModelFallbackRaceID` tinyint(4) NOT NULL DEFAULT '0',
@@ -1534,6 +1898,7 @@ CREATE TABLE `chr_races` (
   `MaleTextureFallbackSex` tinyint(4) NOT NULL DEFAULT '0',
   `FemaleTextureFallbackRaceID` tinyint(4) NOT NULL DEFAULT '0',
   `FemaleTextureFallbackSex` tinyint(4) NOT NULL DEFAULT '0',
+  `UnalteredVisualCustomizationRaceID` tinyint(3) NOT NULL DEFAULT '0',
   `VerifiedBuild` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`,`VerifiedBuild`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
@@ -1553,6 +1918,15 @@ CREATE TABLE `chr_races_locale` (
   `NameFemale_lang` text COLLATE utf8mb4_unicode_ci,
   `NameLowercase_lang` text COLLATE utf8mb4_unicode_ci,
   `NameFemaleLowercase_lang` text COLLATE utf8mb4_unicode_ci,
+  `NameS_lang` text COLLATE utf8mb4_unicode_ci,
+  `NameFemaleS_lang` text COLLATE utf8mb4_unicode_ci,
+  `NameLowercaseS_lang` text COLLATE utf8mb4_unicode_ci,
+  `NameFemaleLowercaseS_lang` text COLLATE utf8mb4_unicode_ci,
+  `RaceFantasyDescription_lang` text COLLATE utf8mb4_unicode_ci,
+  `NameL_lang` text COLLATE utf8mb4_unicode_ci,
+  `NameFemaleL_lang` text COLLATE utf8mb4_unicode_ci,
+  `NameLowercaseL_lang` text COLLATE utf8mb4_unicode_ci,
+  `NameFemaleLowercaseL_lang` text COLLATE utf8mb4_unicode_ci,
   `VerifiedBuild` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`,`locale`,`VerifiedBuild`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci
@@ -1677,10 +2051,17 @@ DROP TABLE IF EXISTS `content_tuning`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `content_tuning` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `MinLevel` int(11) NOT NULL DEFAULT '0',
-  `MaxLevel` int(11) NOT NULL DEFAULT '0',
   `Flags` int(11) NOT NULL DEFAULT '0',
   `ExpansionID` int(11) NOT NULL DEFAULT '0',
+  `MinLevel` int(11) NOT NULL DEFAULT '0',
+  `MaxLevel` int(11) NOT NULL DEFAULT '0',
+  `MinLevelType` int(11) NOT NULL DEFAULT '0',
+  `MaxLevelType` int(11) NOT NULL DEFAULT '0',
+  `TargetLevelDelta` int(11) NOT NULL DEFAULT '0',
+  `TargetLevelMaxDelta` int(11) NOT NULL DEFAULT '0',
+  `TargetLevelMin` int(11) NOT NULL DEFAULT '0',
+  `TargetLevelMax` int(11) NOT NULL DEFAULT '0',
+  `MinItemLevel` int(11) NOT NULL DEFAULT '0',
   `VerifiedBuild` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`,`VerifiedBuild`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
@@ -1855,17 +2236,9 @@ CREATE TABLE `creature_display_info_extra` (
   `DisplayRaceID` tinyint(4) NOT NULL DEFAULT '0',
   `DisplaySexID` tinyint(4) NOT NULL DEFAULT '0',
   `DisplayClassID` tinyint(4) NOT NULL DEFAULT '0',
-  `SkinID` tinyint(4) NOT NULL DEFAULT '0',
-  `FaceID` tinyint(4) NOT NULL DEFAULT '0',
-  `HairStyleID` tinyint(4) NOT NULL DEFAULT '0',
-  `HairColorID` tinyint(4) NOT NULL DEFAULT '0',
-  `FacialHairID` tinyint(4) NOT NULL DEFAULT '0',
   `Flags` tinyint(4) NOT NULL DEFAULT '0',
   `BakeMaterialResourcesID` int(11) NOT NULL DEFAULT '0',
   `HDBakeMaterialResourcesID` int(11) NOT NULL DEFAULT '0',
-  `CustomDisplayOption1` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `CustomDisplayOption2` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `CustomDisplayOption3` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`,`VerifiedBuild`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
@@ -2100,18 +2473,20 @@ CREATE TABLE `currency_types` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `Name` text COLLATE utf8mb4_unicode_ci,
   `Description` text COLLATE utf8mb4_unicode_ci,
-  `CategoryID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `CategoryID` int(11) NOT NULL DEFAULT '0',
   `InventoryIconFileID` int(11) NOT NULL DEFAULT '0',
   `SpellWeight` int(10) unsigned NOT NULL DEFAULT '0',
   `SpellCategory` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `MaxQty` int(10) unsigned NOT NULL DEFAULT '0',
   `MaxEarnablePerWeek` int(10) unsigned NOT NULL DEFAULT '0',
-  `Flags` int(10) unsigned NOT NULL DEFAULT '0',
   `Quality` tinyint(4) NOT NULL DEFAULT '0',
   `FactionID` int(11) NOT NULL DEFAULT '0',
   `ItemGroupSoundsID` int(11) NOT NULL DEFAULT '0',
-  `ConvertToPlayerExperience` int(11) NOT NULL DEFAULT '0',
-  `PlayerConditionID` int(11) NOT NULL DEFAULT '0',
+  `XpQuestDifficulty` int(11) NOT NULL DEFAULT '0',
+  `AwardConditionID` int(11) NOT NULL DEFAULT '0',
+  `MaxQtyWorldStateID` int(11) NOT NULL DEFAULT '0',
+  `Flags1` int(11) NOT NULL DEFAULT '0',
+  `Flags2` int(11) NOT NULL DEFAULT '0',
   `VerifiedBuild` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`,`VerifiedBuild`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
@@ -2172,6 +2547,8 @@ CREATE TABLE `curve_point` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `PosX` float NOT NULL DEFAULT '0',
   `PosY` float NOT NULL DEFAULT '0',
+  `PosPreSquishX` float NOT NULL DEFAULT '0',
+  `PosPreSquishY` float NOT NULL DEFAULT '0',
   `CurveID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `OrderIndex` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` int(11) NOT NULL DEFAULT '0',
@@ -2190,20 +2567,20 @@ CREATE TABLE `destructible_model_data` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `State0ImpactEffectDoodadSet` tinyint(4) NOT NULL DEFAULT '0',
   `State0AmbientDoodadSet` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `State1Wmo` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `State1Wmo` int(11) NOT NULL DEFAULT '0',
   `State1DestructionDoodadSet` tinyint(4) NOT NULL DEFAULT '0',
   `State1ImpactEffectDoodadSet` tinyint(4) NOT NULL DEFAULT '0',
   `State1AmbientDoodadSet` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `State2Wmo` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `State2Wmo` int(11) NOT NULL DEFAULT '0',
   `State2DestructionDoodadSet` tinyint(4) NOT NULL DEFAULT '0',
   `State2ImpactEffectDoodadSet` tinyint(4) NOT NULL DEFAULT '0',
   `State2AmbientDoodadSet` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `State3Wmo` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `State3Wmo` int(11) NOT NULL DEFAULT '0',
   `State3InitDoodadSet` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `State3AmbientDoodadSet` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `EjectDirection` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `DoNotHighlight` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `State0Wmo` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `State0Wmo` int(11) NOT NULL DEFAULT '0',
   `HealEffect` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `HealEffectSpeed` smallint(5) unsigned NOT NULL DEFAULT '0',
   `State0NameSet` tinyint(4) NOT NULL DEFAULT '0',
@@ -2280,7 +2657,7 @@ CREATE TABLE `dungeon_encounter` (
   `Name` text COLLATE utf8mb4_unicode_ci,
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `MapID` smallint(6) NOT NULL DEFAULT '0',
-  `DifficultyID` tinyint(4) NOT NULL DEFAULT '0',
+  `DifficultyID` int(11) NOT NULL DEFAULT '0',
   `OrderIndex` int(11) NOT NULL DEFAULT '0',
   `CompleteWorldStateID` int(11) NOT NULL DEFAULT '0',
   `Bit` tinyint(4) NOT NULL DEFAULT '0',
@@ -2586,6 +2963,99 @@ CREATE TABLE `faction_template` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `friendship_rep_reaction`
+--
+
+DROP TABLE IF EXISTS `friendship_rep_reaction`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `friendship_rep_reaction` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Reaction` text COLLATE utf8mb4_unicode_ci,
+  `FriendshipRepID` int(10) unsigned NOT NULL DEFAULT '0',
+  `ReactionThreshold` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` int(11) 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 `friendship_rep_reaction_locale`
+--
+
+DROP TABLE IF EXISTS `friendship_rep_reaction_locale`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `friendship_rep_reaction_locale` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `locale` varchar(4) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `Reaction_lang` text COLLATE utf8mb4_unicode_ci,
+  `VerifiedBuild` int(11) 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 `friendship_reputation`
+--
+
+DROP TABLE IF EXISTS `friendship_reputation`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `friendship_reputation` (
+  `Description` text COLLATE utf8mb4_unicode_ci,
+  `StandingModified` text COLLATE utf8mb4_unicode_ci,
+  `StandingChanged` text COLLATE utf8mb4_unicode_ci,
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `FactionID` int(11) NOT NULL DEFAULT '0',
+  `TextureFileID` int(11) NOT NULL DEFAULT '0',
+  `Flags` int(11) NOT NULL DEFAULT '0',
+  `VerifiedBuild` int(11) 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 `friendship_reputation_locale`
+--
+
+DROP TABLE IF EXISTS `friendship_reputation_locale`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `friendship_reputation_locale` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `locale` varchar(4) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `Description_lang` text COLLATE utf8mb4_unicode_ci,
+  `StandingModified_lang` text COLLATE utf8mb4_unicode_ci,
+  `StandingChanged_lang` text COLLATE utf8mb4_unicode_ci,
+  `VerifiedBuild` int(11) 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 `gameobject_display_info`
 --
 
@@ -2626,13 +3096,13 @@ CREATE TABLE `gameobjects` (
   `Rot3` float NOT NULL DEFAULT '0',
   `Rot4` float NOT NULL DEFAULT '0',
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `OwnerID` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `DisplayID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `OwnerID` int(11) NOT NULL DEFAULT '0',
+  `DisplayID` int(11) NOT NULL DEFAULT '0',
   `Scale` float NOT NULL DEFAULT '0',
-  `TypeID` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `PhaseUseFlags` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `PhaseID` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `PhaseGroupID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `TypeID` int(11) NOT NULL DEFAULT '0',
+  `PhaseUseFlags` int(11) NOT NULL DEFAULT '0',
+  `PhaseID` int(11) NOT NULL DEFAULT '0',
+  `PhaseGroupID` int(11) NOT NULL DEFAULT '0',
   `PropValue1` int(11) NOT NULL DEFAULT '0',
   `PropValue2` int(11) NOT NULL DEFAULT '0',
   `PropValue3` int(11) NOT NULL DEFAULT '0',
@@ -2739,7 +3209,7 @@ CREATE TABLE `garr_building` (
   `BuildingType` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `HordeGameObjectID` int(11) NOT NULL DEFAULT '0',
   `AllianceGameObjectID` int(11) NOT NULL DEFAULT '0',
-  `GarrSiteID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `GarrSiteID` int(11) NOT NULL DEFAULT '0',
   `UpgradeLevel` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `BuildSeconds` int(11) NOT NULL DEFAULT '0',
   `CurrencyTypeID` smallint(5) unsigned NOT NULL DEFAULT '0',
@@ -2899,6 +3369,8 @@ CREATE TABLE `garr_follower` (
   `ChrClassID` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `Flags` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `Gender` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `AutoCombatantID` int(11) NOT NULL DEFAULT '0',
+  `CovenantID` int(11) NOT NULL DEFAULT '0',
   `VerifiedBuild` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`,`VerifiedBuild`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
@@ -3059,7 +3531,22 @@ CREATE TABLE `gem_properties` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `EnchantId` smallint(5) unsigned NOT NULL DEFAULT '0',
   `Type` int(11) NOT NULL DEFAULT '0',
-  `MinItemLevel` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` int(11) 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 `global_curve`
+--
+
+DROP TABLE IF EXISTS `global_curve`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `global_curve` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `CurveID` int(11) NOT NULL DEFAULT '0',
+  `Type` int(11) NOT NULL DEFAULT '0',
   `VerifiedBuild` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`,`VerifiedBuild`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
@@ -3335,13 +3822,30 @@ CREATE TABLE `hotfix_data` (
   `Id` int(11) NOT NULL,
   `TableHash` int(10) unsigned NOT NULL,
   `RecordId` int(11) NOT NULL,
-  `Deleted` tinyint(3) unsigned DEFAULT '0',
+  `Status` tinyint(3) unsigned NOT NULL DEFAULT '3',
   `VerifiedBuild` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`Id`,`TableHash`,`RecordId`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `hotfix_optional_data`
+--
+
+DROP TABLE IF EXISTS `hotfix_optional_data`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `hotfix_optional_data` (
+  `TableHash` int(10) unsigned NOT NULL,
+  `RecordId` int(10) unsigned NOT NULL,
+  `locale` varchar(4) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `Key` int(10) unsigned NOT NULL,
+  `Data` blob NOT NULL,
+  `VerifiedBuild` int(11) NOT NULL DEFAULT '0'
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `import_price_armor`
 --
 
@@ -3421,6 +3925,7 @@ CREATE TABLE `item` (
   `SoundOverrideSubclassID` tinyint(4) NOT NULL DEFAULT '0',
   `IconFileDataID` int(11) NOT NULL DEFAULT '0',
   `ItemGroupSoundsID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `ModifiedCraftingReagentItemID` int(11) NOT NULL DEFAULT '0',
   `VerifiedBuild` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`,`VerifiedBuild`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
@@ -3439,6 +3944,7 @@ CREATE TABLE `item_appearance` (
   `ItemDisplayInfoID` int(11) NOT NULL DEFAULT '0',
   `DefaultIconFileDataID` int(11) NOT NULL DEFAULT '0',
   `UiOrder` int(11) NOT NULL DEFAULT '0',
+  `PlayerConditionID` int(11) NOT NULL DEFAULT '0',
   `VerifiedBuild` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`,`VerifiedBuild`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
@@ -3560,6 +4066,7 @@ CREATE TABLE `item_bonus` (
   `Value1` int(11) NOT NULL DEFAULT '0',
   `Value2` int(11) NOT NULL DEFAULT '0',
   `Value3` int(11) NOT NULL DEFAULT '0',
+  `Value4` int(11) NOT NULL DEFAULT '0',
   `ParentItemBonusListID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `Type` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `OrderIndex` tinyint(3) unsigned NOT NULL DEFAULT '0',
@@ -3596,6 +4103,8 @@ CREATE TABLE `item_bonus_tree_node` (
   `ChildItemBonusTreeID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `ChildItemBonusListID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `ChildItemLevelSelectorID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `ItemBonusListGroupID` int(11) NOT NULL DEFAULT '0',
+  `ParentItemBonusTreeNodeID` int(11) NOT NULL DEFAULT '0',
   `ParentItemBonusTreeID` int(10) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`,`VerifiedBuild`)
@@ -4004,6 +4513,25 @@ CREATE TABLE `item_modified_appearance` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `item_modified_appearance_extra`
+--
+
+DROP TABLE IF EXISTS `item_modified_appearance_extra`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `item_modified_appearance_extra` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `IconFileDataID` int(11) NOT NULL DEFAULT '0',
+  `UnequippedIconFileDataID` int(11) NOT NULL DEFAULT '0',
+  `SheatheType` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `DisplayWeaponSubclassID` tinyint(4) NOT NULL DEFAULT '0',
+  `DisplayInventoryType` tinyint(4) NOT NULL DEFAULT '0',
+  `VerifiedBuild` int(11) 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_name_description`
 --
 
@@ -4253,6 +4781,9 @@ CREATE TABLE `item_sparse` (
   `Flags3` int(11) NOT NULL DEFAULT '0',
   `Flags4` int(11) NOT NULL DEFAULT '0',
   `FactionRelated` int(11) NOT NULL DEFAULT '0',
+  `ModifiedCraftingReagentItemID` int(11) NOT NULL DEFAULT '0',
+  `ContentTuningID` int(11) NOT NULL DEFAULT '0',
+  `PlayerLevelToItemLevelCurveID` int(11) NOT NULL DEFAULT '0',
   `ItemNameDescriptionID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `RequiredTransmogHoliday` smallint(5) unsigned NOT NULL DEFAULT '0',
   `RequiredHoliday` smallint(5) unsigned NOT NULL DEFAULT '0',
@@ -4268,7 +4799,6 @@ CREATE TABLE `item_sparse` (
   `StartQuestID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `PageID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `ItemDelay` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `ScalingStatDistributionID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `MinFactionID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `RequiredSkillRank` smallint(5) unsigned NOT NULL DEFAULT '0',
   `RequiredSkill` smallint(5) unsigned NOT NULL DEFAULT '0',
@@ -4439,6 +4969,64 @@ CREATE TABLE `keychain` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `language_words`
+--
+
+DROP TABLE IF EXISTS `language_words`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `language_words` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Word` text COLLATE utf8mb4_unicode_ci,
+  `LanguageID` int(10) unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` int(11) 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 `languages`
+--
+
+DROP TABLE IF EXISTS `languages`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `languages` (
+  `Name` text COLLATE utf8mb4_unicode_ci,
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` int(11) 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 `languages_locale`
+--
+
+DROP TABLE IF EXISTS `languages_locale`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `languages_locale` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `locale` varchar(4) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `Name_lang` text COLLATE utf8mb4_unicode_ci,
+  `VerifiedBuild` int(11) 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 `lfg_dungeons`
 --
 
@@ -4449,8 +5037,6 @@ CREATE TABLE `lfg_dungeons` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `Name` text COLLATE utf8mb4_unicode_ci,
   `Description` text COLLATE utf8mb4_unicode_ci,
-  `MinLevel` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `MaxLevel` smallint(5) unsigned NOT NULL DEFAULT '0',
   `TypeID` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `Subtype` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `Faction` tinyint(4) NOT NULL DEFAULT '0',
@@ -4464,9 +5050,6 @@ CREATE TABLE `lfg_dungeons` (
   `GroupID` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `OrderIndex` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `RequiredPlayerConditionId` int(10) unsigned NOT NULL DEFAULT '0',
-  `TargetLevel` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `TargetLevelMin` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `TargetLevelMax` smallint(5) unsigned NOT NULL DEFAULT '0',
   `RandomID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `ScenarioID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `FinalEncounterID` smallint(5) unsigned NOT NULL DEFAULT '0',
@@ -4479,6 +5062,7 @@ CREATE TABLE `lfg_dungeons` (
   `BonusReputationAmount` smallint(5) unsigned NOT NULL DEFAULT '0',
   `MentorItemLevel` smallint(5) unsigned NOT NULL DEFAULT '0',
   `MentorCharLevel` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `ContentTuningID` int(11) NOT NULL DEFAULT '0',
   `Flags1` int(11) NOT NULL DEFAULT '0',
   `Flags2` int(11) NOT NULL DEFAULT '0',
   `VerifiedBuild` int(11) NOT NULL DEFAULT '0',
@@ -4620,6 +5204,7 @@ DROP TABLE IF EXISTS `lock`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `lock` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Flags` int(11) NOT NULL DEFAULT '0',
   `Index1` int(11) NOT NULL DEFAULT '0',
   `Index2` int(11) NOT NULL DEFAULT '0',
   `Index3` int(11) NOT NULL DEFAULT '0',
@@ -4710,6 +5295,7 @@ CREATE TABLE `map` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `Directory` text COLLATE utf8mb4_unicode_ci,
   `MapName` text COLLATE utf8mb4_unicode_ci,
+  `InternalName` text COLLATE utf8mb4_unicode_ci,
   `MapDescription0` text COLLATE utf8mb4_unicode_ci,
   `MapDescription1` text COLLATE utf8mb4_unicode_ci,
   `PvpShortDescription` text COLLATE utf8mb4_unicode_ci,
@@ -4790,6 +5376,51 @@ CREATE TABLE `map_difficulty_locale` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `map_difficulty_x_condition`
+--
+
+DROP TABLE IF EXISTS `map_difficulty_x_condition`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `map_difficulty_x_condition` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `FailureDescription` text COLLATE utf8mb4_unicode_ci,
+  `PlayerConditionID` int(10) unsigned NOT NULL DEFAULT '0',
+  `OrderIndex` int(11) NOT NULL DEFAULT '0',
+  `MapDifficultyID` int(10) unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` int(11) 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 `map_difficulty_x_condition_locale`
+--
+
+DROP TABLE IF EXISTS `map_difficulty_x_condition_locale`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `map_difficulty_x_condition_locale` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `locale` varchar(4) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `FailureDescription_lang` text COLLATE utf8mb4_unicode_ci,
+  `VerifiedBuild` int(11) 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 `map_locale`
 --
 
@@ -5078,6 +5709,23 @@ CREATE TABLE `override_spell_data` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `paragon_reputation`
+--
+
+DROP TABLE IF EXISTS `paragon_reputation`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `paragon_reputation` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `FactionID` int(10) unsigned NOT NULL DEFAULT '0',
+  `LevelThreshold` int(11) NOT NULL DEFAULT '0',
+  `QuestID` int(11) NOT NULL DEFAULT '0',
+  `VerifiedBuild` int(11) 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 `phase`
 --
 
@@ -5119,11 +5767,9 @@ CREATE TABLE `player_condition` (
   `RaceMask` bigint(20) NOT NULL DEFAULT '0',
   `FailureDescription` text COLLATE utf8mb4_unicode_ci,
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `MinLevel` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `MaxLevel` smallint(5) unsigned NOT NULL DEFAULT '0',
   `ClassMask` int(11) NOT NULL DEFAULT '0',
   `SkillLogic` int(10) unsigned NOT NULL DEFAULT '0',
-  `LanguageID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `LanguageID` int(11) NOT NULL DEFAULT '0',
   `MinLanguage` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `MaxLanguage` int(11) NOT NULL DEFAULT '0',
   `MaxFactionID` smallint(5) unsigned NOT NULL DEFAULT '0',
@@ -5139,7 +5785,7 @@ CREATE TABLE `player_condition` (
   `ItemFlags` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `AuraSpellLogic` int(10) unsigned NOT NULL DEFAULT '0',
   `WorldStateExpressionID` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `WeatherID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `WeatherID` int(11) NOT NULL DEFAULT '0',
   `PartyStatus` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `LifetimeMaxPVPRank` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `AchievementLogic` int(10) unsigned NOT NULL DEFAULT '0',
@@ -5148,7 +5794,7 @@ CREATE TABLE `player_condition` (
   `AreaLogic` int(10) unsigned NOT NULL DEFAULT '0',
   `LfgLogic` int(10) unsigned NOT NULL DEFAULT '0',
   `CurrencyLogic` int(10) unsigned NOT NULL DEFAULT '0',
-  `QuestKillID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `QuestKillID` int(11) NOT NULL DEFAULT '0',
   `QuestKillLogic` int(10) unsigned NOT NULL DEFAULT '0',
   `MinExpansionLevel` tinyint(4) NOT NULL DEFAULT '0',
   `MaxExpansionLevel` tinyint(4) NOT NULL DEFAULT '0',
@@ -5159,7 +5805,7 @@ CREATE TABLE `player_condition` (
   `PhaseUseFlags` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `PhaseID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `PhaseGroupID` int(10) unsigned NOT NULL DEFAULT '0',
-  `Flags` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Flags` int(11) NOT NULL DEFAULT '0',
   `ChrSpecializationIndex` tinyint(4) NOT NULL DEFAULT '0',
   `ChrSpecializationRole` tinyint(4) NOT NULL DEFAULT '0',
   `ModifierTreeID` int(10) unsigned NOT NULL DEFAULT '0',
@@ -5173,6 +5819,8 @@ CREATE TABLE `player_condition` (
   `MinExpansionTier` tinyint(4) NOT NULL DEFAULT '0',
   `MinPVPRank` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `MaxPVPRank` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `ContentTuningID` int(11) NOT NULL DEFAULT '0',
+  `CovenantID` int(11) NOT NULL DEFAULT '0',
   `SkillID1` smallint(5) unsigned NOT NULL DEFAULT '0',
   `SkillID2` smallint(5) unsigned NOT NULL DEFAULT '0',
   `SkillID3` smallint(5) unsigned NOT NULL DEFAULT '0',
@@ -5191,18 +5839,18 @@ CREATE TABLE `player_condition` (
   `MinReputation1` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `MinReputation2` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `MinReputation3` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `PrevQuestID1` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `PrevQuestID2` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `PrevQuestID3` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `PrevQuestID4` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `CurrQuestID1` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `CurrQuestID2` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `CurrQuestID3` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `CurrQuestID4` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `CurrentCompletedQuestID1` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `CurrentCompletedQuestID2` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `CurrentCompletedQuestID3` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `CurrentCompletedQuestID4` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `PrevQuestID1` int(11) NOT NULL DEFAULT '0',
+  `PrevQuestID2` int(11) NOT NULL DEFAULT '0',
+  `PrevQuestID3` int(11) NOT NULL DEFAULT '0',
+  `PrevQuestID4` int(11) NOT NULL DEFAULT '0',
+  `CurrQuestID1` int(11) NOT NULL DEFAULT '0',
+  `CurrQuestID2` int(11) NOT NULL DEFAULT '0',
+  `CurrQuestID3` int(11) NOT NULL DEFAULT '0',
+  `CurrQuestID4` int(11) NOT NULL DEFAULT '0',
+  `CurrentCompletedQuestID1` int(11) NOT NULL DEFAULT '0',
+  `CurrentCompletedQuestID2` int(11) NOT NULL DEFAULT '0',
+  `CurrentCompletedQuestID3` int(11) NOT NULL DEFAULT '0',
+  `CurrentCompletedQuestID4` int(11) NOT NULL DEFAULT '0',
   `SpellID1` int(11) NOT NULL DEFAULT '0',
   `SpellID2` int(11) NOT NULL DEFAULT '0',
   `SpellID3` int(11) NOT NULL DEFAULT '0',
@@ -5503,6 +6151,55 @@ CREATE TABLE `pvp_talent_slot_unlock` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `pvp_tier`
+--
+
+DROP TABLE IF EXISTS `pvp_tier`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `pvp_tier` (
+  `Name` text COLLATE utf8mb4_unicode_ci,
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `MinRating` smallint(6) NOT NULL DEFAULT '0',
+  `MaxRating` smallint(6) NOT NULL DEFAULT '0',
+  `PrevTier` int(11) NOT NULL DEFAULT '0',
+  `NextTier` int(11) NOT NULL DEFAULT '0',
+  `BracketID` tinyint(4) NOT NULL DEFAULT '0',
+  `Rank` tinyint(4) NOT NULL DEFAULT '0',
+  `RankIconFileDataID` int(11) NOT NULL DEFAULT '0',
+  `VerifiedBuild` int(11) 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_tier_locale`
+--
+
+DROP TABLE IF EXISTS `pvp_tier_locale`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `pvp_tier_locale` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `locale` varchar(4) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `Name_lang` text COLLATE utf8mb4_unicode_ci,
+  `VerifiedBuild` int(11) 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 `quest_faction_reward`
 --
 
@@ -5527,6 +6224,68 @@ CREATE TABLE `quest_faction_reward` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `quest_info`
+--
+
+DROP TABLE IF EXISTS `quest_info`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `quest_info` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `InfoName` text COLLATE utf8mb4_unicode_ci,
+  `Type` tinyint(4) NOT NULL DEFAULT '0',
+  `Modifiers` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Profession` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` int(11) 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 `quest_info_locale`
+--
+
+DROP TABLE IF EXISTS `quest_info_locale`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `quest_info_locale` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `locale` varchar(4) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `InfoName_lang` text COLLATE utf8mb4_unicode_ci,
+  `VerifiedBuild` int(11) 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 `quest_line_x_quest`
+--
+
+DROP TABLE IF EXISTS `quest_line_x_quest`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `quest_line_x_quest` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `QuestLineID` int(10) unsigned NOT NULL DEFAULT '0',
+  `QuestID` int(10) unsigned NOT NULL DEFAULT '0',
+  `OrderIndex` int(10) unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` int(11) 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 `quest_money_reward`
 --
 
@@ -5659,13 +6418,30 @@ DROP TABLE IF EXISTS `rand_prop_points`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `rand_prop_points` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `DamageReplaceStatF` float NOT NULL DEFAULT '0',
+  `DamageSecondaryF` float NOT NULL DEFAULT '0',
   `DamageReplaceStat` int(11) NOT NULL DEFAULT '0',
   `DamageSecondary` int(11) NOT NULL DEFAULT '0',
+  `EpicF1` float NOT NULL DEFAULT '0',
+  `EpicF2` float NOT NULL DEFAULT '0',
+  `EpicF3` float NOT NULL DEFAULT '0',
+  `EpicF4` float NOT NULL DEFAULT '0',
+  `EpicF5` float NOT NULL DEFAULT '0',
   `Epic1` int(10) unsigned NOT NULL DEFAULT '0',
   `Epic2` int(10) unsigned NOT NULL DEFAULT '0',
   `Epic3` int(10) unsigned NOT NULL DEFAULT '0',
   `Epic4` int(10) unsigned NOT NULL DEFAULT '0',
   `Epic5` int(10) unsigned NOT NULL DEFAULT '0',
+  `SuperiorF1` float NOT NULL DEFAULT '0',
+  `SuperiorF2` float NOT NULL DEFAULT '0',
+  `SuperiorF3` float NOT NULL DEFAULT '0',
+  `SuperiorF4` float NOT NULL DEFAULT '0',
+  `SuperiorF5` float NOT NULL DEFAULT '0',
+  `GoodF1` float NOT NULL DEFAULT '0',
+  `GoodF2` float NOT NULL DEFAULT '0',
+  `GoodF3` float NOT NULL DEFAULT '0',
+  `GoodF4` float NOT NULL DEFAULT '0',
+  `GoodF5` float NOT NULL DEFAULT '0',
   `Superior1` int(10) unsigned NOT NULL DEFAULT '0',
   `Superior2` int(10) unsigned NOT NULL DEFAULT '0',
   `Superior3` int(10) unsigned NOT NULL DEFAULT '0',
@@ -5736,23 +6512,6 @@ CREATE TABLE `reward_pack_x_item` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
--- Table structure for table `scaling_stat_distribution`
---
-
-DROP TABLE IF EXISTS `scaling_stat_distribution`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `scaling_stat_distribution` (
-  `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `PlayerLevelToItemLevelCurveID` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `MinLevel` int(11) NOT NULL DEFAULT '0',
-  `MaxLevel` int(11) NOT NULL DEFAULT '0',
-  `VerifiedBuild` int(11) 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 `scenario`
 --
 
@@ -5811,7 +6570,7 @@ CREATE TABLE `scenario_step` (
   `Title` text COLLATE utf8mb4_unicode_ci,
   `ScenarioID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `Criteriatreeid` int(10) unsigned NOT NULL DEFAULT '0',
-  `RewardQuestID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `RewardQuestID` int(11) NOT NULL DEFAULT '0',
   `RelatedStep` int(11) NOT NULL DEFAULT '0',
   `Supersedes` smallint(5) unsigned NOT NULL DEFAULT '0',
   `OrderIndex` tinyint(3) unsigned NOT NULL DEFAULT '0',
@@ -5958,7 +6717,7 @@ CREATE TABLE `skill_line_ability` (
   `AcquireMethod` tinyint(4) NOT NULL DEFAULT '0',
   `TrivialSkillLineRankHigh` smallint(6) NOT NULL DEFAULT '0',
   `TrivialSkillLineRankLow` smallint(6) NOT NULL DEFAULT '0',
-  `Flags` tinyint(4) NOT NULL DEFAULT '0',
+  `Flags` int(11) NOT NULL DEFAULT '0',
   `NumSkillUps` tinyint(4) NOT NULL DEFAULT '0',
   `UniqueBit` smallint(6) NOT NULL DEFAULT '0',
   `TradeSkillCategoryID` smallint(6) NOT NULL DEFAULT '0',
@@ -6167,7 +6926,6 @@ DROP TABLE IF EXISTS `spell_cast_times`;
 CREATE TABLE `spell_cast_times` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `Base` int(11) NOT NULL DEFAULT '0',
-  `PerLevel` smallint(6) NOT NULL DEFAULT '0',
   `Minimum` int(11) NOT NULL DEFAULT '0',
   `VerifiedBuild` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`,`VerifiedBuild`)
@@ -6315,7 +7073,6 @@ DROP TABLE IF EXISTS `spell_duration`;
 CREATE TABLE `spell_duration` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `Duration` int(11) NOT NULL DEFAULT '0',
-  `DurationPerLevel` int(10) unsigned NOT NULL DEFAULT '0',
   `MaxDuration` int(11) NOT NULL DEFAULT '0',
   `VerifiedBuild` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`,`VerifiedBuild`)
@@ -6334,7 +7091,7 @@ CREATE TABLE `spell_effect` (
   `EffectAura` smallint(6) NOT NULL DEFAULT '0',
   `DifficultyID` int(11) NOT NULL DEFAULT '0',
   `EffectIndex` int(11) NOT NULL DEFAULT '0',
-  `Effect` int(10) unsigned NOT NULL DEFAULT '0',
+  `Effect` int(11) NOT NULL DEFAULT '0',
   `EffectAmplitude` float NOT NULL DEFAULT '0',
   `EffectAttributes` int(11) NOT NULL DEFAULT '0',
   `EffectAuraPeriod` int(11) NOT NULL DEFAULT '0',
@@ -6459,18 +7216,20 @@ DROP TABLE IF EXISTS `spell_item_enchantment`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `spell_item_enchantment` (
-  `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `Name` text COLLATE utf8mb4_unicode_ci,
   `HordeName` text COLLATE utf8mb4_unicode_ci,
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `EffectArg1` int(10) unsigned NOT NULL DEFAULT '0',
   `EffectArg2` int(10) unsigned NOT NULL DEFAULT '0',
   `EffectArg3` int(10) unsigned NOT NULL DEFAULT '0',
   `EffectScalingPoints1` float NOT NULL DEFAULT '0',
   `EffectScalingPoints2` float NOT NULL DEFAULT '0',
   `EffectScalingPoints3` float NOT NULL DEFAULT '0',
-  `TransmogPlayerConditionID` int(10) unsigned NOT NULL DEFAULT '0',
-  `TransmogCost` int(10) unsigned NOT NULL DEFAULT '0',
   `IconFileDataID` int(10) unsigned NOT NULL DEFAULT '0',
+  `TransmogCost` int(10) unsigned NOT NULL DEFAULT '0',
+  `MinItemLevel` int(11) NOT NULL DEFAULT '0',
+  `MaxItemLevel` int(11) NOT NULL DEFAULT '0',
+  `TransmogUseConditionID` int(10) unsigned NOT NULL DEFAULT '0',
   `EffectPointsMin1` smallint(6) NOT NULL DEFAULT '0',
   `EffectPointsMin2` smallint(6) NOT NULL DEFAULT '0',
   `EffectPointsMin3` smallint(6) NOT NULL DEFAULT '0',
@@ -6566,6 +7325,22 @@ CREATE TABLE `spell_item_enchantment_locale` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `spell_label`
+--
+
+DROP TABLE IF EXISTS `spell_label`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `spell_label` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `LabelID` int(10) unsigned NOT NULL DEFAULT '0',
+  `SpellID` int(10) unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` int(11) 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 `spell_learn_spell`
 --
 
@@ -6592,10 +7367,10 @@ DROP TABLE IF EXISTS `spell_levels`;
 CREATE TABLE `spell_levels` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `DifficultyID` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `BaseLevel` smallint(6) NOT NULL DEFAULT '0',
   `MaxLevel` smallint(6) NOT NULL DEFAULT '0',
-  `SpellLevel` smallint(6) NOT NULL DEFAULT '0',
   `MaxPassiveAuraLevel` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `BaseLevel` int(11) NOT NULL DEFAULT '0',
+  `SpellLevel` int(11) NOT NULL DEFAULT '0',
   `SpellID` int(10) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`,`VerifiedBuild`)
@@ -6625,6 +7400,7 @@ CREATE TABLE `spell_misc` (
   `Attributes12` int(11) NOT NULL DEFAULT '0',
   `Attributes13` int(11) NOT NULL DEFAULT '0',
   `Attributes14` int(11) NOT NULL DEFAULT '0',
+  `Attributes15` int(11) NOT NULL DEFAULT '0',
   `DifficultyID` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `CastingTimeIndex` smallint(5) unsigned NOT NULL DEFAULT '0',
   `DurationIndex` smallint(5) unsigned NOT NULL DEFAULT '0',
@@ -6636,6 +7412,9 @@ CREATE TABLE `spell_misc` (
   `SpellIconFileDataID` int(11) NOT NULL DEFAULT '0',
   `ActiveIconFileDataID` int(11) NOT NULL DEFAULT '0',
   `ContentTuningID` int(11) NOT NULL DEFAULT '0',
+  `ShowFutureSpellPlayerConditionID` int(11) NOT NULL DEFAULT '0',
+  `SpellVisualScript` int(11) NOT NULL DEFAULT '0',
+  `ActiveSpellVisualScript` int(11) NOT NULL DEFAULT '0',
   `SpellID` int(10) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`,`VerifiedBuild`)
@@ -6753,7 +7532,7 @@ DROP TABLE IF EXISTS `spell_procs_per_minute_mod`;
 CREATE TABLE `spell_procs_per_minute_mod` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `Type` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `Param` smallint(6) NOT NULL DEFAULT '0',
+  `Param` int(11) NOT NULL DEFAULT '0',
   `Coeff` float NOT NULL DEFAULT '0',
   `SpellProcsPerMinuteID` int(10) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` int(11) NOT NULL DEFAULT '0',
@@ -7032,7 +7811,6 @@ CREATE TABLE `spell_x_spell_visual` (
   `DifficultyID` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `SpellVisualID` int(10) unsigned NOT NULL DEFAULT '0',
   `Probability` float NOT NULL DEFAULT '0',
-  `Flags` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `Priority` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `SpellIconFileID` int(11) NOT NULL DEFAULT '0',
   `ActiveIconFileID` int(11) NOT NULL DEFAULT '0',
@@ -7352,6 +8130,24 @@ CREATE TABLE `transmog_holiday` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `transmog_illusion`
+--
+
+DROP TABLE IF EXISTS `transmog_illusion`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `transmog_illusion` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `UnlockConditionID` int(11) NOT NULL DEFAULT '0',
+  `TransmogCost` int(11) NOT NULL DEFAULT '0',
+  `SpellItemEnchantmentID` int(11) NOT NULL DEFAULT '0',
+  `Flags` int(11) NOT NULL DEFAULT '0',
+  `VerifiedBuild` int(11) 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 `transmog_set`
 --
 
@@ -7517,14 +8313,13 @@ CREATE TABLE `ui_map` (
   `Flags` int(11) NOT NULL DEFAULT '0',
   `System` int(11) NOT NULL DEFAULT '0',
   `Type` int(11) NOT NULL DEFAULT '0',
-  `LevelRangeMin` int(10) unsigned NOT NULL DEFAULT '0',
-  `LevelRangeMax` int(10) unsigned NOT NULL DEFAULT '0',
   `BountySetID` int(11) NOT NULL DEFAULT '0',
   `BountyDisplayLocation` int(10) unsigned NOT NULL DEFAULT '0',
   `VisibilityPlayerConditionID` int(11) NOT NULL DEFAULT '0',
   `HelpTextPosition` tinyint(4) NOT NULL DEFAULT '0',
   `BkgAtlasID` int(11) NOT NULL DEFAULT '0',
   `AlternateUiMapGroup` int(11) NOT NULL DEFAULT '0',
+  `ContentTuningID` int(11) NOT NULL DEFAULT '0',
   `VerifiedBuild` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`,`VerifiedBuild`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
@@ -7578,6 +8373,7 @@ CREATE TABLE `ui_map_link` (
   `ChildUiMapID` int(11) NOT NULL DEFAULT '0',
   `OverrideHighlightFileDataID` int(11) NOT NULL DEFAULT '0',
   `OverrideHighlightAtlasID` int(11) NOT NULL DEFAULT '0',
+  `Flags` int(11) NOT NULL DEFAULT '0',
   `VerifiedBuild` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`,`VerifiedBuild`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
@@ -7750,9 +8546,9 @@ CREATE TABLE `vehicle` (
   `FacingLimitRight` float NOT NULL DEFAULT '0',
   `FacingLimitLeft` float NOT NULL DEFAULT '0',
   `CameraYawOffset` float NOT NULL DEFAULT '0',
-  `UiLocomotionType` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `VehicleUIIndicatorID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `MissileTargetingID` int(11) NOT NULL DEFAULT '0',
+  `VehiclePOITypeID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `SeatID1` smallint(5) unsigned NOT NULL DEFAULT '0',
   `SeatID2` smallint(5) unsigned NOT NULL DEFAULT '0',
   `SeatID3` smallint(5) unsigned NOT NULL DEFAULT '0',
@@ -7980,4 +8776,4 @@ CREATE TABLE `world_state_expression` (
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2020-10-20 21:36:54
+-- Dump completed on 2021-07-04 22:23:28
diff --git a/sql/base/dev/world_database.sql b/sql/base/dev/world_database.sql
index 2075f6ec9f1..a22e0044097 100644
--- a/sql/base/dev/world_database.sql
+++ b/sql/base/dev/world_database.sql
@@ -1,8 +1,8 @@
--- MySQL dump 10.13  Distrib 5.7.30, for Linux (x86_64)
+-- MySQL dump 10.13  Distrib 5.7.34, for Linux (x86_64)
 --
 -- Host: localhost    Database: world
 -- ------------------------------------------------------
--- Server version	5.7.30-0ubuntu0.18.04.1
+-- Server version	5.7.34
 
 /*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
 /*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
@@ -94,6 +94,30 @@ CREATE TABLE `achievement_reward_locale` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `areatrigger`
+--
+
+DROP TABLE IF EXISTS `areatrigger`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `areatrigger` (
+  `SpawnId` bigint(20) unsigned NOT NULL,
+  `AreaTriggerId` int(10) unsigned NOT NULL,
+  `IsServerSide` tinyint(1) unsigned NOT NULL,
+  `MapId` int(10) unsigned NOT NULL,
+  `PosX` float NOT NULL,
+  `PosY` float NOT NULL,
+  `PosZ` float NOT NULL,
+  `Orientation` float NOT NULL,
+  `PhaseUseFlags` tinyint(3) unsigned DEFAULT '0',
+  `PhaseId` int(10) unsigned DEFAULT '0',
+  `PhaseGroup` int(10) unsigned DEFAULT '0',
+  `Comment` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`SpawnId`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `areatrigger_involvedrelation`
 --
 
@@ -160,6 +184,7 @@ DROP TABLE IF EXISTS `areatrigger_template`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `areatrigger_template` (
   `Id` int(10) unsigned NOT NULL,
+  `IsServerSide` tinyint(1) unsigned NOT NULL,
   `Type` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `Flags` int(10) unsigned NOT NULL DEFAULT '0',
   `Data0` float NOT NULL DEFAULT '0',
@@ -170,7 +195,7 @@ CREATE TABLE `areatrigger_template` (
   `Data5` float NOT NULL DEFAULT '0',
   `ScriptName` char(64) NOT NULL DEFAULT '',
   `VerifiedBuild` int(10) unsigned NOT NULL DEFAULT '0',
-  PRIMARY KEY (`Id`)
+  PRIMARY KEY (`Id`,`IsServerSide`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -183,10 +208,11 @@ DROP TABLE IF EXISTS `areatrigger_template_actions`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `areatrigger_template_actions` (
   `AreaTriggerId` int(10) unsigned NOT NULL,
+  `IsServerSide` tinyint(1) unsigned NOT NULL,
   `ActionType` int(10) unsigned NOT NULL,
   `ActionParam` int(10) unsigned NOT NULL,
   `TargetType` int(10) unsigned NOT NULL DEFAULT '0',
-  PRIMARY KEY (`AreaTriggerId`,`ActionType`,`ActionParam`)
+  PRIMARY KEY (`AreaTriggerId`,`IsServerSide`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -380,22 +406,6 @@ CREATE TABLE `conditions` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
--- Table structure for table `conversation_actor_template`
---
-
-DROP TABLE IF EXISTS `conversation_actor_template`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `conversation_actor_template` (
-  `Id` int(10) unsigned NOT NULL,
-  `CreatureId` int(10) unsigned NOT NULL DEFAULT '0',
-  `CreatureModelId` int(10) unsigned NOT NULL DEFAULT '0',
-  `VerifiedBuild` int(10) unsigned NOT NULL DEFAULT '0',
-  PRIMARY KEY (`Id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
 -- Table structure for table `conversation_actors`
 --
 
@@ -407,6 +417,8 @@ CREATE TABLE `conversation_actors` (
   `ConversationActorId` int(10) unsigned NOT NULL DEFAULT '0',
   `ConversationActorGuid` bigint(20) unsigned NOT NULL DEFAULT '0',
   `Idx` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `CreatureId` int(10) unsigned NOT NULL DEFAULT '0',
+  `CreatureDisplayInfoId` int(10) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` int(10) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`ConversationId`,`Idx`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -780,11 +792,11 @@ CREATE TABLE `creature_template` (
   `ExperienceModifier` float NOT NULL DEFAULT '1',
   `RacialLeader` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `movementId` int(11) unsigned NOT NULL DEFAULT '0',
-  `FadeRegionRadius` float NOT NULL DEFAULT '0',
   `WidgetSetID` int(11) NOT NULL DEFAULT '0',
   `WidgetSetUnitConditionID` int(11) NOT NULL DEFAULT '0',
   `RegenHealth` tinyint(3) unsigned NOT NULL DEFAULT '1',
   `mechanic_immune_mask` int(10) unsigned NOT NULL DEFAULT '0',
+  `spell_school_immune_mask` int(3) unsigned NOT NULL DEFAULT '0',
   `flags_extra` int(10) unsigned NOT NULL DEFAULT '0',
   `ScriptName` varchar(64) NOT NULL DEFAULT '',
   `VerifiedBuild` int(11) NOT NULL DEFAULT '0',
@@ -1058,6 +1070,7 @@ CREATE TABLE `game_event` (
   `occurence` bigint(20) unsigned NOT NULL DEFAULT '5184000' COMMENT 'Delay in minutes between occurences of the event',
   `length` bigint(20) unsigned NOT NULL DEFAULT '2592000' COMMENT 'Length in minutes of the event',
   `holiday` mediumint(8) unsigned NOT NULL DEFAULT '0' COMMENT 'Client side holiday id',
+  `holidayStage` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `description` varchar(255) DEFAULT NULL COMMENT 'Description of the event displayed in console',
   `world_event` tinyint(3) unsigned NOT NULL DEFAULT '0' COMMENT '0 if normal event, 1 if world event',
   `announce` tinyint(3) unsigned DEFAULT '2' COMMENT '0 dont announce, 1 announce, 2 value from config',
@@ -1299,7 +1312,7 @@ CREATE TABLE `game_tele` (
   `map` smallint(5) unsigned NOT NULL DEFAULT '0',
   `name` varchar(100) NOT NULL DEFAULT '',
   PRIMARY KEY (`id`)
-) ENGINE=MyISAM AUTO_INCREMENT=1683 DEFAULT CHARSET=utf8 COMMENT='Tele Command';
+) ENGINE=MyISAM AUTO_INCREMENT=1689 DEFAULT CHARSET=utf8 COMMENT='Tele Command';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1379,6 +1392,7 @@ CREATE TABLE `gameobject_addon` (
   `invisibilityType` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `invisibilityValue` int(10) unsigned NOT NULL DEFAULT '0',
   `WorldEffectID` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `AIAnimKitID` int(10) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`guid`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -1499,7 +1513,7 @@ CREATE TABLE `gameobject_template` (
   `Data31` int(10) NOT NULL DEFAULT '0',
   `Data32` int(10) NOT NULL DEFAULT '0',
   `Data33` int(11) NOT NULL DEFAULT '0',
-  `RequiredLevel` int(10) NOT NULL DEFAULT '0',
+  `ContentTuningId` int(11) NOT NULL DEFAULT '0',
   `AIName` char(64) NOT NULL DEFAULT '',
   `ScriptName` varchar(64) NOT NULL DEFAULT '',
   `VerifiedBuild` int(11) NOT NULL DEFAULT '0',
@@ -1522,6 +1536,7 @@ CREATE TABLE `gameobject_template_addon` (
   `mingold` mediumint(8) unsigned NOT NULL DEFAULT '0',
   `maxgold` mediumint(8) unsigned NOT NULL DEFAULT '0',
   `WorldEffectID` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `AIAnimKitID` int(10) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`entry`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -2338,6 +2353,7 @@ DROP TABLE IF EXISTS `playerchoice_response`;
 CREATE TABLE `playerchoice_response` (
   `ChoiceId` int(11) NOT NULL,
   `ResponseId` int(11) NOT NULL,
+  `ResponseIdentifier` smallint(5) unsigned NOT NULL,
   `Index` int(10) unsigned NOT NULL,
   `ChoiceArtFileId` int(11) NOT NULL DEFAULT '0',
   `Flags` int(11) NOT NULL DEFAULT '0',
@@ -2345,6 +2361,7 @@ CREATE TABLE `playerchoice_response` (
   `UiTextureAtlasElementID` int(10) unsigned NOT NULL DEFAULT '0',
   `SoundKitID` int(10) unsigned NOT NULL DEFAULT '0',
   `GroupID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `UiTextureKitID` int(11) NOT NULL DEFAULT '0',
   `Header` varchar(511) NOT NULL,
   `SubHeader` varchar(100) NOT NULL DEFAULT '',
   `ButtonTooltip` varchar(400) NOT NULL DEFAULT '',
@@ -2380,6 +2397,26 @@ CREATE TABLE `playerchoice_response_locale` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `playerchoice_response_maw_power`
+--
+
+DROP TABLE IF EXISTS `playerchoice_response_maw_power`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `playerchoice_response_maw_power` (
+  `ChoiceId` int(11) NOT NULL,
+  `ResponseId` int(11) NOT NULL,
+  `TypeArtFileID` int(11) DEFAULT '0',
+  `Rarity` int(11) DEFAULT '0',
+  `RarityColor` int(10) unsigned DEFAULT '0',
+  `SpellID` int(11) DEFAULT '0',
+  `MaxStacks` int(11) DEFAULT '0',
+  `VerifiedBuild` int(11) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ChoiceId`,`ResponseId`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `playerchoice_response_reward`
 --
 
@@ -2458,6 +2495,25 @@ CREATE TABLE `playerchoice_response_reward_item` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `playerchoice_response_reward_item_choice`
+--
+
+DROP TABLE IF EXISTS `playerchoice_response_reward_item_choice`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `playerchoice_response_reward_item_choice` (
+  `ChoiceId` int(11) NOT NULL,
+  `ResponseId` int(11) NOT NULL,
+  `Index` int(10) unsigned NOT NULL,
+  `ItemId` int(10) unsigned NOT NULL DEFAULT '0',
+  `BonusListIDs` text,
+  `Quantity` int(11) NOT NULL DEFAULT '0',
+  `VerifiedBuild` int(11) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ChoiceId`,`ResponseId`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `playercreateinfo`
 --
 
@@ -2559,6 +2615,7 @@ CREATE TABLE `points_of_interest` (
   `Flags` mediumint(8) unsigned NOT NULL DEFAULT '0',
   `Importance` mediumint(8) unsigned NOT NULL DEFAULT '0',
   `Name` text,
+  `Unknown905` int(11) NOT NULL DEFAULT '0',
   `VerifiedBuild` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -2855,6 +2912,7 @@ CREATE TABLE `quest_poi` (
   `Flags` int(11) NOT NULL DEFAULT '0',
   `WorldEffectID` int(11) NOT NULL DEFAULT '0',
   `PlayerConditionID` int(11) NOT NULL DEFAULT '0',
+  `NavigationPlayerConditionID` int(11) NOT NULL DEFAULT '0',
   `SpawnTrackingID` int(11) NOT NULL DEFAULT '0',
   `AlwaysAllowMergingBlobs` tinyint(1) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` int(11) NOT NULL DEFAULT '0',
@@ -2876,6 +2934,7 @@ CREATE TABLE `quest_poi_points` (
   `Idx2` int(11) NOT NULL DEFAULT '0',
   `X` int(11) NOT NULL DEFAULT '0',
   `Y` int(11) NOT NULL DEFAULT '0',
+  `Z` int(11) NOT NULL DEFAULT '0',
   `VerifiedBuild` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`QuestID`,`Idx1`,`Idx2`),
   KEY `questId_id` (`QuestID`)
@@ -2918,6 +2977,43 @@ CREATE TABLE `quest_request_items_locale` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `quest_reward_choice_items`
+--
+
+DROP TABLE IF EXISTS `quest_reward_choice_items`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `quest_reward_choice_items` (
+  `QuestID` int(10) unsigned NOT NULL,
+  `Type1` tinyint(3) unsigned DEFAULT '0',
+  `Type2` tinyint(3) unsigned DEFAULT '0',
+  `Type3` tinyint(3) unsigned DEFAULT '0',
+  `Type4` tinyint(3) unsigned DEFAULT '0',
+  `Type5` tinyint(3) unsigned DEFAULT '0',
+  `Type6` tinyint(3) unsigned DEFAULT '0',
+  `VerifiedBuild` int(11) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`QuestID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `quest_reward_display_spell`
+--
+
+DROP TABLE IF EXISTS `quest_reward_display_spell`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `quest_reward_display_spell` (
+  `QuestID` int(10) unsigned NOT NULL,
+  `Idx` int(10) unsigned NOT NULL,
+  `SpellID` int(10) unsigned DEFAULT '0',
+  `PlayerConditionID` int(10) unsigned DEFAULT '0',
+  `VerifiedBuild` int(11) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`QuestID`,`Idx`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `quest_template`
 --
 
@@ -2927,11 +3023,8 @@ DROP TABLE IF EXISTS `quest_template`;
 CREATE TABLE `quest_template` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `QuestType` tinyint(3) unsigned NOT NULL DEFAULT '2',
-  `QuestLevel` int(11) NOT NULL DEFAULT '-1',
-  `ScalingFactionGroup` int(11) NOT NULL DEFAULT '0',
-  `MaxScalingLevel` int(11) NOT NULL DEFAULT '255',
   `QuestPackageID` int(10) unsigned NOT NULL DEFAULT '0',
-  `MinLevel` int(11) NOT NULL DEFAULT '0',
+  `ContentTuningID` int(10) unsigned NOT NULL DEFAULT '0',
   `QuestSortID` smallint(6) NOT NULL DEFAULT '0',
   `QuestInfoID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `SuggestedGroupNum` tinyint(3) unsigned NOT NULL DEFAULT '0',
@@ -3003,23 +3096,23 @@ CREATE TABLE `quest_template` (
   `RewardFactionID1` int(10) unsigned NOT NULL DEFAULT '0',
   `RewardFactionValue1` int(11) NOT NULL DEFAULT '0',
   `RewardFactionOverride1` int(11) NOT NULL DEFAULT '0',
-  `RewardFactionCapIn1` int(10) unsigned NOT NULL DEFAULT '0',
+  `RewardFactionCapIn1` int(10) NOT NULL DEFAULT '0',
   `RewardFactionID2` int(10) unsigned NOT NULL DEFAULT '0',
   `RewardFactionValue2` int(11) NOT NULL DEFAULT '0',
   `RewardFactionOverride2` int(11) NOT NULL DEFAULT '0',
-  `RewardFactionCapIn2` int(10) unsigned NOT NULL DEFAULT '0',
+  `RewardFactionCapIn2` int(10) NOT NULL DEFAULT '0',
   `RewardFactionID3` int(10) unsigned NOT NULL DEFAULT '0',
   `RewardFactionValue3` int(11) NOT NULL DEFAULT '0',
   `RewardFactionOverride3` int(11) NOT NULL DEFAULT '0',
-  `RewardFactionCapIn3` int(10) unsigned NOT NULL DEFAULT '0',
+  `RewardFactionCapIn3` int(10) NOT NULL DEFAULT '0',
   `RewardFactionID4` int(10) unsigned NOT NULL DEFAULT '0',
   `RewardFactionValue4` int(11) NOT NULL DEFAULT '0',
   `RewardFactionOverride4` int(11) NOT NULL DEFAULT '0',
-  `RewardFactionCapIn4` int(10) unsigned NOT NULL DEFAULT '0',
+  `RewardFactionCapIn4` int(10) NOT NULL DEFAULT '0',
   `RewardFactionID5` int(10) unsigned NOT NULL DEFAULT '0',
   `RewardFactionValue5` int(11) NOT NULL DEFAULT '0',
   `RewardFactionOverride5` int(11) NOT NULL DEFAULT '0',
-  `RewardFactionCapIn5` int(10) unsigned NOT NULL DEFAULT '0',
+  `RewardFactionCapIn5` int(10) NOT NULL DEFAULT '0',
   `RewardFactionFlags` int(10) unsigned NOT NULL DEFAULT '0',
   `RewardCurrencyID1` int(10) unsigned NOT NULL DEFAULT '0',
   `RewardCurrencyQty1` int(10) unsigned NOT NULL DEFAULT '0',
@@ -3224,6 +3317,7 @@ CREATE TABLE `scenario_poi` (
   `Flags` int(11) NOT NULL DEFAULT '0',
   `WorldEffectID` int(11) NOT NULL DEFAULT '0',
   `PlayerConditionID` int(11) NOT NULL DEFAULT '0',
+  `NavigationPlayerConditionID` int(11) NOT NULL DEFAULT '0',
   `VerifiedBuild` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`CriteriaTreeID`,`BlobIndex`,`Idx1`),
   KEY `idx` (`CriteriaTreeID`,`BlobIndex`)
@@ -3243,6 +3337,7 @@ CREATE TABLE `scenario_poi_points` (
   `Idx2` int(11) NOT NULL DEFAULT '0',
   `X` int(11) NOT NULL DEFAULT '0',
   `Y` int(11) NOT NULL DEFAULT '0',
+  `Z` int(11) NOT NULL DEFAULT '0',
   `VerifiedBuild` int(11) NOT NULL DEFAULT '0',
   PRIMARY KEY (`CriteriaTreeID`,`Idx1`,`Idx2`),
   KEY `questId_id` (`CriteriaTreeID`)
@@ -3276,6 +3371,7 @@ CREATE TABLE `scene_template` (
   `SceneId` int(10) unsigned NOT NULL,
   `Flags` int(10) unsigned NOT NULL DEFAULT '0',
   `ScriptPackageID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Encrypted` tinyint(1) unsigned NOT NULL DEFAULT '0',
   `ScriptName` varchar(64) NOT NULL DEFAULT '',
   PRIMARY KEY (`SceneId`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -3337,6 +3433,140 @@ CREATE TABLE `script_waypoint` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `serverside_spell`
+--
+
+DROP TABLE IF EXISTS `serverside_spell`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `serverside_spell` (
+  `Id` int(10) unsigned NOT NULL,
+  `DifficultyID` int(11) NOT NULL DEFAULT '0',
+  `CategoryId` int(10) unsigned NOT NULL DEFAULT '0',
+  `Dispel` int(10) unsigned NOT NULL DEFAULT '0',
+  `Mechanic` int(10) unsigned NOT NULL DEFAULT '0',
+  `Attributes` int(10) unsigned NOT NULL DEFAULT '0',
+  `AttributesEx` int(10) unsigned NOT NULL DEFAULT '0',
+  `AttributesEx2` int(10) unsigned NOT NULL DEFAULT '0',
+  `AttributesEx3` int(10) unsigned NOT NULL DEFAULT '0',
+  `AttributesEx4` int(10) unsigned NOT NULL DEFAULT '0',
+  `AttributesEx5` int(10) unsigned NOT NULL DEFAULT '0',
+  `AttributesEx6` int(10) unsigned NOT NULL DEFAULT '0',
+  `AttributesEx7` int(10) unsigned NOT NULL DEFAULT '0',
+  `AttributesEx8` int(10) unsigned NOT NULL DEFAULT '0',
+  `AttributesEx9` int(10) unsigned NOT NULL DEFAULT '0',
+  `AttributesEx10` int(10) unsigned NOT NULL DEFAULT '0',
+  `AttributesEx11` int(10) unsigned NOT NULL DEFAULT '0',
+  `AttributesEx12` int(10) unsigned NOT NULL DEFAULT '0',
+  `AttributesEx13` int(10) unsigned NOT NULL DEFAULT '0',
+  `AttributesEx14` int(10) unsigned NOT NULL DEFAULT '0',
+  `Stances` bigint(20) unsigned NOT NULL DEFAULT '0',
+  `StancesNot` bigint(20) unsigned NOT NULL DEFAULT '0',
+  `Targets` int(10) unsigned NOT NULL DEFAULT '0',
+  `TargetCreatureType` int(10) unsigned NOT NULL DEFAULT '0',
+  `RequiresSpellFocus` int(10) unsigned NOT NULL DEFAULT '0',
+  `FacingCasterFlags` int(10) unsigned NOT NULL DEFAULT '0',
+  `CasterAuraState` int(10) unsigned NOT NULL DEFAULT '0',
+  `TargetAuraState` int(10) unsigned NOT NULL DEFAULT '0',
+  `ExcludeCasterAuraState` int(10) unsigned NOT NULL DEFAULT '0',
+  `ExcludeTargetAuraState` int(10) unsigned NOT NULL DEFAULT '0',
+  `CasterAuraSpell` int(10) unsigned NOT NULL DEFAULT '0',
+  `TargetAuraSpell` int(10) unsigned NOT NULL DEFAULT '0',
+  `ExcludeCasterAuraSpell` int(10) unsigned NOT NULL DEFAULT '0',
+  `ExcludeTargetAuraSpell` int(10) unsigned NOT NULL DEFAULT '0',
+  `CastingTimeIndex` int(10) unsigned NOT NULL DEFAULT '1',
+  `RecoveryTime` int(10) unsigned NOT NULL DEFAULT '0',
+  `CategoryRecoveryTime` int(10) unsigned NOT NULL DEFAULT '0',
+  `StartRecoveryCategory` int(10) unsigned NOT NULL DEFAULT '0',
+  `StartRecoveryTime` int(10) unsigned NOT NULL DEFAULT '0',
+  `InterruptFlags` int(10) unsigned NOT NULL DEFAULT '0',
+  `AuraInterruptFlags1` int(10) unsigned NOT NULL DEFAULT '0',
+  `AuraInterruptFlags2` int(10) unsigned NOT NULL DEFAULT '0',
+  `ChannelInterruptFlags1` int(10) unsigned NOT NULL DEFAULT '0',
+  `ChannelInterruptFlags2` int(10) unsigned NOT NULL DEFAULT '0',
+  `ProcFlags` int(10) unsigned NOT NULL DEFAULT '0',
+  `ProcChance` int(10) unsigned NOT NULL DEFAULT '0',
+  `ProcCharges` int(10) unsigned NOT NULL DEFAULT '0',
+  `ProcCooldown` int(10) unsigned NOT NULL DEFAULT '0',
+  `ProcBasePPM` float NOT NULL DEFAULT '0',
+  `MaxLevel` int(10) unsigned NOT NULL DEFAULT '0',
+  `BaseLevel` int(10) unsigned NOT NULL DEFAULT '0',
+  `SpellLevel` int(10) unsigned NOT NULL DEFAULT '0',
+  `DurationIndex` int(10) unsigned NOT NULL DEFAULT '0',
+  `RangeIndex` int(10) unsigned NOT NULL DEFAULT '1',
+  `Speed` float NOT NULL DEFAULT '0',
+  `LaunchDelay` float NOT NULL DEFAULT '0',
+  `StackAmount` int(10) unsigned NOT NULL DEFAULT '0',
+  `EquippedItemClass` int(11) NOT NULL DEFAULT '-1',
+  `EquippedItemSubClassMask` int(11) NOT NULL DEFAULT '0',
+  `EquippedItemInventoryTypeMask` int(11) NOT NULL DEFAULT '0',
+  `ContentTuningId` int(10) unsigned NOT NULL DEFAULT '0',
+  `SpellName` varchar(100) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `ConeAngle` float NOT NULL DEFAULT '0',
+  `ConeWidth` float NOT NULL DEFAULT '0',
+  `MaxTargetLevel` int(10) unsigned NOT NULL DEFAULT '0',
+  `MaxAffectedTargets` int(10) unsigned NOT NULL DEFAULT '0',
+  `SpellFamilyName` int(10) unsigned NOT NULL DEFAULT '0',
+  `SpellFamilyFlags1` int(10) unsigned NOT NULL DEFAULT '0',
+  `SpellFamilyFlags2` int(10) unsigned NOT NULL DEFAULT '0',
+  `SpellFamilyFlags3` int(10) unsigned NOT NULL DEFAULT '0',
+  `SpellFamilyFlags4` int(10) unsigned NOT NULL DEFAULT '0',
+  `DmgClass` int(10) unsigned NOT NULL DEFAULT '0',
+  `PreventionType` int(10) unsigned NOT NULL DEFAULT '0',
+  `AreaGroupId` int(11) NOT NULL DEFAULT '0',
+  `SchoolMask` int(10) unsigned NOT NULL DEFAULT '0',
+  `ChargeCategoryId` int(10) unsigned NOT NULL DEFAULT '0',
+  PRIMARY KEY (`Id`,`DifficultyID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `serverside_spell_effect`
+--
+
+DROP TABLE IF EXISTS `serverside_spell_effect`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `serverside_spell_effect` (
+  `SpellID` int(10) unsigned NOT NULL DEFAULT '0',
+  `EffectIndex` int(11) NOT NULL DEFAULT '0',
+  `DifficultyID` int(11) NOT NULL DEFAULT '0',
+  `Effect` int(11) NOT NULL DEFAULT '0',
+  `EffectAura` smallint(11) NOT NULL DEFAULT '0',
+  `EffectAmplitude` float NOT NULL DEFAULT '0',
+  `EffectAttributes` int(11) NOT NULL DEFAULT '0',
+  `EffectAuraPeriod` int(11) NOT NULL DEFAULT '0',
+  `EffectBonusCoefficient` float NOT NULL DEFAULT '0',
+  `EffectChainAmplitude` float NOT NULL DEFAULT '0',
+  `EffectChainTargets` int(11) NOT NULL DEFAULT '0',
+  `EffectItemType` int(11) NOT NULL DEFAULT '0',
+  `EffectMechanic` int(11) NOT NULL DEFAULT '0',
+  `EffectPointsPerResource` float NOT NULL DEFAULT '0',
+  `EffectPosFacing` float NOT NULL DEFAULT '0',
+  `EffectRealPointsPerLevel` float NOT NULL DEFAULT '0',
+  `EffectTriggerSpell` int(11) NOT NULL DEFAULT '0',
+  `BonusCoefficientFromAP` float NOT NULL DEFAULT '0',
+  `PvpMultiplier` float NOT NULL DEFAULT '0',
+  `Coefficient` float NOT NULL DEFAULT '0',
+  `Variance` float NOT NULL DEFAULT '0',
+  `ResourceCoefficient` float NOT NULL DEFAULT '0',
+  `GroupSizeBasePointsCoefficient` float NOT NULL DEFAULT '0',
+  `EffectBasePoints` float NOT NULL DEFAULT '0',
+  `EffectMiscValue1` int(11) NOT NULL DEFAULT '0',
+  `EffectMiscValue2` int(11) NOT NULL DEFAULT '0',
+  `EffectRadiusIndex1` int(10) unsigned NOT NULL DEFAULT '0',
+  `EffectRadiusIndex2` int(10) unsigned NOT NULL DEFAULT '0',
+  `EffectSpellClassMask1` int(11) NOT NULL DEFAULT '0',
+  `EffectSpellClassMask2` int(11) NOT NULL DEFAULT '0',
+  `EffectSpellClassMask3` int(11) NOT NULL DEFAULT '0',
+  `EffectSpellClassMask4` int(11) NOT NULL DEFAULT '0',
+  `ImplicitTarget1` smallint(11) NOT NULL DEFAULT '0',
+  `ImplicitTarget2` smallint(11) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`SpellID`,`EffectIndex`,`DifficultyID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `skill_discovery_template`
 --
 
@@ -3614,50 +3844,13 @@ DROP TABLE IF EXISTS `spell_custom_attr`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `spell_custom_attr` (
-  `entry` mediumint(8) unsigned NOT NULL DEFAULT '0' COMMENT 'spell id',
-  `attributes` mediumint(8) unsigned NOT NULL DEFAULT '0' COMMENT 'SpellCustomAttributes',
+  `entry` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'spell id',
+  `attributes` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'SpellCustomAttributes',
   PRIMARY KEY (`entry`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='SpellInfo custom attributes';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
--- Table structure for table `spell_dbc`
---
-
-DROP TABLE IF EXISTS `spell_dbc`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `spell_dbc` (
-  `Id` int(10) unsigned NOT NULL,
-  `Attributes` int(10) unsigned NOT NULL DEFAULT '0',
-  `AttributesEx` int(10) unsigned NOT NULL DEFAULT '0',
-  `AttributesEx2` int(10) unsigned NOT NULL DEFAULT '0',
-  `AttributesEx3` int(10) unsigned NOT NULL DEFAULT '0',
-  `AttributesEx4` int(10) unsigned NOT NULL DEFAULT '0',
-  `AttributesEx5` int(10) unsigned NOT NULL DEFAULT '0',
-  `AttributesEx6` int(10) unsigned NOT NULL DEFAULT '0',
-  `AttributesEx7` int(10) unsigned NOT NULL DEFAULT '0',
-  `AttributesEx8` int(10) unsigned NOT NULL DEFAULT '0',
-  `AttributesEx9` int(10) unsigned NOT NULL DEFAULT '0',
-  `AttributesEx10` int(10) unsigned NOT NULL DEFAULT '0',
-  `CastingTimeIndex` int(10) unsigned NOT NULL DEFAULT '1',
-  `DurationIndex` int(10) unsigned NOT NULL DEFAULT '0',
-  `RangeIndex` int(10) unsigned NOT NULL DEFAULT '1',
-  `SchoolMask` int(10) unsigned NOT NULL DEFAULT '0',
-  `SpellAuraOptionsId` int(10) unsigned NOT NULL DEFAULT '0',
-  `SpellCastingRequirementsId` int(10) unsigned NOT NULL DEFAULT '0',
-  `SpellCategoriesId` int(10) unsigned NOT NULL DEFAULT '0',
-  `SpellClassOptionsId` int(10) unsigned NOT NULL DEFAULT '0',
-  `SpellEquippedItemsId` int(10) unsigned NOT NULL DEFAULT '0',
-  `SpellLevelsId` int(10) unsigned NOT NULL DEFAULT '0',
-  `SpellTargetRestrictionsId` int(10) unsigned NOT NULL DEFAULT '0',
-  `SpellInterruptsId` int(10) unsigned NOT NULL DEFAULT '0',
-  `Comment` text NOT NULL,
-  PRIMARY KEY (`Id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Custom spell.dbc entries';
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
 -- Table structure for table `spell_enchant_proc_data`
 --
 
@@ -3901,43 +4094,6 @@ CREATE TABLE `spell_totem_model` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
--- Table structure for table `spelleffect_dbc`
---
-
-DROP TABLE IF EXISTS `spelleffect_dbc`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `spelleffect_dbc` (
-  `Id` int(10) unsigned NOT NULL,
-  `Effect` int(10) unsigned NOT NULL DEFAULT '0',
-  `EffectValueMultiplier` float unsigned NOT NULL DEFAULT '0',
-  `EffectApplyAuraName` int(10) unsigned NOT NULL DEFAULT '0',
-  `EffectAmplitude` int(10) unsigned NOT NULL DEFAULT '0',
-  `EffectBasePoints` int(10) NOT NULL DEFAULT '0',
-  `EffectBonusMultiplier` float unsigned NOT NULL DEFAULT '0',
-  `EffectDamageMultiplier` float unsigned NOT NULL DEFAULT '0',
-  `EffectChainTarget` int(10) unsigned NOT NULL DEFAULT '0',
-  `EffectDieSides` int(10) NOT NULL DEFAULT '0',
-  `EffectItemType` int(10) unsigned NOT NULL DEFAULT '0',
-  `EffectMechanic` int(10) unsigned NOT NULL DEFAULT '0',
-  `EffectMiscValue` int(10) NOT NULL DEFAULT '0',
-  `EffectMiscValueB` int(10) NOT NULL DEFAULT '0',
-  `EffectRadiusIndex` int(10) unsigned NOT NULL DEFAULT '0',
-  `EffectRadiusIndexMax` int(10) unsigned NOT NULL DEFAULT '0',
-  `EffectRealPointsPerLevel` float unsigned NOT NULL DEFAULT '0',
-  `EffectSpellClassMaskA` int(10) unsigned NOT NULL DEFAULT '0',
-  `EffectSpellClassMaskB` int(10) unsigned NOT NULL DEFAULT '0',
-  `EffectSpellClassMaskC` int(10) unsigned NOT NULL DEFAULT '0',
-  `EffectTriggerSpell` int(10) unsigned NOT NULL DEFAULT '0',
-  `EffectImplicitTargetA` int(10) unsigned NOT NULL DEFAULT '0',
-  `EffectImplicitTargetB` int(10) unsigned NOT NULL DEFAULT '0',
-  `EffectSpellId` int(10) unsigned NOT NULL,
-  `EffectIndex` int(10) unsigned NOT NULL,
-  PRIMARY KEY (`Id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
 -- Table structure for table `terrain_swap_defaults`
 --
 
@@ -4114,6 +4270,20 @@ CREATE TABLE `vehicle_accessory` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `vehicle_template`
+--
+
+DROP TABLE IF EXISTS `vehicle_template`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `vehicle_template` (
+  `creatureId` int(10) unsigned NOT NULL,
+  `despawnDelayMs` int(11) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`creatureId`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `vehicle_template_accessory`
 --
 
@@ -4264,4 +4434,4 @@ CREATE TABLE `world_safe_locs` (
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2020-10-20 21:36:52
+-- Dump completed on 2021-07-04 22:23:27
diff --git a/sql/updates/auth/master/2017_10_13_00_auth.sql b/sql/old/9.x/auth/20101_2021_07_04/2017_10_13_00_auth.sql
index 145714e9564..145714e9564 100644
--- a/sql/updates/auth/master/2017_10_13_00_auth.sql
+++ b/sql/old/9.x/auth/20101_2021_07_04/2017_10_13_00_auth.sql
diff --git a/sql/updates/auth/master/2017_12_17_00_auth.sql b/sql/old/9.x/auth/20101_2021_07_04/2017_12_17_00_auth.sql
index 89f3a0bc619..89f3a0bc619 100644
--- a/sql/updates/auth/master/2017_12_17_00_auth.sql
+++ b/sql/old/9.x/auth/20101_2021_07_04/2017_12_17_00_auth.sql
diff --git a/sql/updates/auth/master/2018_01_24_00_auth.sql b/sql/old/9.x/auth/20101_2021_07_04/2018_01_24_00_auth.sql
index 119db7ae391..119db7ae391 100644
--- a/sql/updates/auth/master/2018_01_24_00_auth.sql
+++ b/sql/old/9.x/auth/20101_2021_07_04/2018_01_24_00_auth.sql
diff --git a/sql/updates/auth/master/2020_10_20_00_auth.sql b/sql/old/9.x/auth/20101_2021_07_04/2020_10_20_00_auth.sql
index 3a890913a62..3a890913a62 100644
--- a/sql/updates/auth/master/2020_10_20_00_auth.sql
+++ b/sql/old/9.x/auth/20101_2021_07_04/2020_10_20_00_auth.sql
diff --git a/sql/updates/auth/master/2020_12_06_00_auth.sql b/sql/old/9.x/auth/20101_2021_07_04/2020_12_06_00_auth.sql
index b5f8c3e86a7..b5f8c3e86a7 100644
--- a/sql/updates/auth/master/2020_12_06_00_auth.sql
+++ b/sql/old/9.x/auth/20101_2021_07_04/2020_12_06_00_auth.sql
diff --git a/sql/updates/auth/master/2020_12_07_00_auth.sql b/sql/old/9.x/auth/20101_2021_07_04/2020_12_07_00_auth.sql
index f8e3c9eba08..f8e3c9eba08 100644
--- a/sql/updates/auth/master/2020_12_07_00_auth.sql
+++ b/sql/old/9.x/auth/20101_2021_07_04/2020_12_07_00_auth.sql
diff --git a/sql/updates/auth/master/2020_12_15_00_auth.sql b/sql/old/9.x/auth/20101_2021_07_04/2020_12_15_00_auth.sql
index d4c8cae681a..d4c8cae681a 100644
--- a/sql/updates/auth/master/2020_12_15_00_auth.sql
+++ b/sql/old/9.x/auth/20101_2021_07_04/2020_12_15_00_auth.sql
diff --git a/sql/updates/auth/master/2020_12_22_00_auth.sql b/sql/old/9.x/auth/20101_2021_07_04/2020_12_22_00_auth.sql
index f60d40c31f0..f60d40c31f0 100644
--- a/sql/updates/auth/master/2020_12_22_00_auth.sql
+++ b/sql/old/9.x/auth/20101_2021_07_04/2020_12_22_00_auth.sql
diff --git a/sql/updates/auth/master/2020_12_31_00_auth.sql b/sql/old/9.x/auth/20101_2021_07_04/2020_12_31_00_auth.sql
index 44d29e41def..44d29e41def 100644
--- a/sql/updates/auth/master/2020_12_31_00_auth.sql
+++ b/sql/old/9.x/auth/20101_2021_07_04/2020_12_31_00_auth.sql
diff --git a/sql/updates/auth/master/2021_01_10_00_auth.sql b/sql/old/9.x/auth/20101_2021_07_04/2021_01_10_00_auth.sql
index d81eea0922d..d81eea0922d 100644
--- a/sql/updates/auth/master/2021_01_10_00_auth.sql
+++ b/sql/old/9.x/auth/20101_2021_07_04/2021_01_10_00_auth.sql
diff --git a/sql/updates/auth/master/2021_01_13_00_auth.sql b/sql/old/9.x/auth/20101_2021_07_04/2021_01_13_00_auth.sql
index a3035fb22cb..a3035fb22cb 100644
--- a/sql/updates/auth/master/2021_01_13_00_auth.sql
+++ b/sql/old/9.x/auth/20101_2021_07_04/2021_01_13_00_auth.sql
diff --git a/sql/updates/auth/master/2021_02_09_00_auth.sql b/sql/old/9.x/auth/20101_2021_07_04/2021_02_09_00_auth.sql
index 1c08faaabc0..1c08faaabc0 100644
--- a/sql/updates/auth/master/2021_02_09_00_auth.sql
+++ b/sql/old/9.x/auth/20101_2021_07_04/2021_02_09_00_auth.sql
diff --git a/sql/updates/auth/master/2021_04_10_00_auth.sql b/sql/old/9.x/auth/20101_2021_07_04/2021_04_10_00_auth.sql
index fb67d68a4c9..fb67d68a4c9 100644
--- a/sql/updates/auth/master/2021_04_10_00_auth.sql
+++ b/sql/old/9.x/auth/20101_2021_07_04/2021_04_10_00_auth.sql
diff --git a/sql/updates/auth/master/2021_05_12_00_auth.sql b/sql/old/9.x/auth/20101_2021_07_04/2021_05_12_00_auth.sql
index aeb60d94ea1..aeb60d94ea1 100644
--- a/sql/updates/auth/master/2021_05_12_00_auth.sql
+++ b/sql/old/9.x/auth/20101_2021_07_04/2021_05_12_00_auth.sql
diff --git a/sql/updates/characters/master/2020_10_20_00_characters.sql b/sql/old/9.x/characters/20101_2021_07_04/2020_10_20_00_characters.sql
index dcaa032fd80..dcaa032fd80 100644
--- a/sql/updates/characters/master/2020_10_20_00_characters.sql
+++ b/sql/old/9.x/characters/20101_2021_07_04/2020_10_20_00_characters.sql
diff --git a/sql/updates/characters/master/2020_11_16_00_characters.sql b/sql/old/9.x/characters/20101_2021_07_04/2020_11_16_00_characters.sql
index 52cd9c89b42..52cd9c89b42 100644
--- a/sql/updates/characters/master/2020_11_16_00_characters.sql
+++ b/sql/old/9.x/characters/20101_2021_07_04/2020_11_16_00_characters.sql
diff --git a/sql/updates/characters/master/2020_12_13_00_characters.sql b/sql/old/9.x/characters/20101_2021_07_04/2020_12_13_00_characters.sql
index e0a3bb433e8..e0a3bb433e8 100644
--- a/sql/updates/characters/master/2020_12_13_00_characters.sql
+++ b/sql/old/9.x/characters/20101_2021_07_04/2020_12_13_00_characters.sql
diff --git a/sql/updates/characters/master/2021_03_27_00_characters_aura_stored_location.sql b/sql/old/9.x/characters/20101_2021_07_04/2021_03_27_00_characters_aura_stored_location.sql
index 2a0f6e93614..2a0f6e93614 100644
--- a/sql/updates/characters/master/2021_03_27_00_characters_aura_stored_location.sql
+++ b/sql/old/9.x/characters/20101_2021_07_04/2021_03_27_00_characters_aura_stored_location.sql
diff --git a/sql/updates/characters/master/2021_04_05_00_characters.sql b/sql/old/9.x/characters/20101_2021_07_04/2021_04_05_00_characters.sql
index 5b66a62f108..5b66a62f108 100644
--- a/sql/updates/characters/master/2021_04_05_00_characters.sql
+++ b/sql/old/9.x/characters/20101_2021_07_04/2021_04_05_00_characters.sql
diff --git a/sql/updates/characters/master/2021_05_10_00_characters.sql b/sql/old/9.x/characters/20101_2021_07_04/2021_05_10_00_characters.sql
index 16a8e9d88da..16a8e9d88da 100644
--- a/sql/updates/characters/master/2021_05_10_00_characters.sql
+++ b/sql/old/9.x/characters/20101_2021_07_04/2021_05_10_00_characters.sql
diff --git a/sql/updates/characters/master/2021_05_11_00_characters.sql b/sql/old/9.x/characters/20101_2021_07_04/2021_05_11_00_characters.sql
index a6d383daa6c..a6d383daa6c 100644
--- a/sql/updates/characters/master/2021_05_11_00_characters.sql
+++ b/sql/old/9.x/characters/20101_2021_07_04/2021_05_11_00_characters.sql
diff --git a/sql/updates/hotfixes/master/2020_10_20_11_hotfixes.sql b/sql/old/9.x/hotfixes/20101_2021_07_04/2020_10_20_11_hotfixes.sql
index c68c0006b98..c68c0006b98 100644
--- a/sql/updates/hotfixes/master/2020_10_20_11_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/20101_2021_07_04/2020_10_20_11_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2020_11_30_00_hotfixes.sql b/sql/old/9.x/hotfixes/20101_2021_07_04/2020_11_30_00_hotfixes.sql
index 14999992a73..14999992a73 100644
--- a/sql/updates/hotfixes/master/2020_11_30_00_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/20101_2021_07_04/2020_11_30_00_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2020_12_11_00_hotfixes.sql b/sql/old/9.x/hotfixes/20101_2021_07_04/2020_12_11_00_hotfixes.sql
index 8fb38de49d1..8fb38de49d1 100644
--- a/sql/updates/hotfixes/master/2020_12_11_00_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/20101_2021_07_04/2020_12_11_00_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2020_12_18_00_hotfixes.sql b/sql/old/9.x/hotfixes/20101_2021_07_04/2020_12_18_00_hotfixes.sql
index ea1081af728..ea1081af728 100644
--- a/sql/updates/hotfixes/master/2020_12_18_00_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/20101_2021_07_04/2020_12_18_00_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2020_12_20_00_hotfixes.sql b/sql/old/9.x/hotfixes/20101_2021_07_04/2020_12_20_00_hotfixes.sql
index dc939580db6..dc939580db6 100644
--- a/sql/updates/hotfixes/master/2020_12_20_00_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/20101_2021_07_04/2020_12_20_00_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2021_01_02_00_hotfixes.sql b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_01_02_00_hotfixes.sql
index f41aaa42e3a..f41aaa42e3a 100644
--- a/sql/updates/hotfixes/master/2021_01_02_00_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_01_02_00_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2021_02_07_00_hotfixes.sql b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_02_07_00_hotfixes.sql
index 063dc163473..063dc163473 100644
--- a/sql/updates/hotfixes/master/2021_02_07_00_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_02_07_00_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2021_02_28_00_hotfixes.sql b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_02_28_00_hotfixes.sql
index c34d9d05b85..c34d9d05b85 100644
--- a/sql/updates/hotfixes/master/2021_02_28_00_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_02_28_00_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2021_03_01_00_hotfixes.sql b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_03_01_00_hotfixes.sql
index 81cedbb15ff..81cedbb15ff 100644
--- a/sql/updates/hotfixes/master/2021_03_01_00_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_03_01_00_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2021_03_01_01_hotfixes.sql b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_03_01_01_hotfixes.sql
index cc8cfb2bad1..cc8cfb2bad1 100644
--- a/sql/updates/hotfixes/master/2021_03_01_01_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_03_01_01_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2021_03_01_02_hotfixes.sql b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_03_01_02_hotfixes.sql
index e4dfa9bc4f6..e4dfa9bc4f6 100644
--- a/sql/updates/hotfixes/master/2021_03_01_02_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_03_01_02_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2021_03_01_03_hotfixes.sql b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_03_01_03_hotfixes.sql
index 338b03f475a..338b03f475a 100644
--- a/sql/updates/hotfixes/master/2021_03_01_03_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_03_01_03_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2021_03_01_04_hotfixes.sql b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_03_01_04_hotfixes.sql
index 3651f405b4e..3651f405b4e 100644
--- a/sql/updates/hotfixes/master/2021_03_01_04_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_03_01_04_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2021_03_01_05_hotfixes.sql b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_03_01_05_hotfixes.sql
index cb4b6e9d1fd..cb4b6e9d1fd 100644
--- a/sql/updates/hotfixes/master/2021_03_01_05_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_03_01_05_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2021_03_01_06_hotfixes.sql b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_03_01_06_hotfixes.sql
index c5df9cf00b1..c5df9cf00b1 100644
--- a/sql/updates/hotfixes/master/2021_03_01_06_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_03_01_06_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2021_03_01_07_hotfixes.sql b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_03_01_07_hotfixes.sql
index 20f72e8de43..20f72e8de43 100644
--- a/sql/updates/hotfixes/master/2021_03_01_07_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_03_01_07_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2021_03_01_08_hotfixes.sql b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_03_01_08_hotfixes.sql
index 0392671ae6c..0392671ae6c 100644
--- a/sql/updates/hotfixes/master/2021_03_01_08_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_03_01_08_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2021_03_01_09_hotfixes.sql b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_03_01_09_hotfixes.sql
index e3383fedc95..e3383fedc95 100644
--- a/sql/updates/hotfixes/master/2021_03_01_09_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_03_01_09_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2021_03_01_10_hotfixes.sql b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_03_01_10_hotfixes.sql
index e113c3b664a..e113c3b664a 100644
--- a/sql/updates/hotfixes/master/2021_03_01_10_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_03_01_10_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2021_03_14_00_hotfixes.sql b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_03_14_00_hotfixes.sql
index 1bf231c7ea5..1bf231c7ea5 100644
--- a/sql/updates/hotfixes/master/2021_03_14_00_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_03_14_00_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2021_03_14_01_hotfixes.sql b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_03_14_01_hotfixes.sql
index 78636252fd6..78636252fd6 100644
--- a/sql/updates/hotfixes/master/2021_03_14_01_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_03_14_01_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2021_03_14_02_hotfixes.sql b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_03_14_02_hotfixes.sql
index 9f3891dcdb6..9f3891dcdb6 100644
--- a/sql/updates/hotfixes/master/2021_03_14_02_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_03_14_02_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2021_04_09_00_hotfixes.sql b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_04_09_00_hotfixes.sql
index d57197330de..d57197330de 100644
--- a/sql/updates/hotfixes/master/2021_04_09_00_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_04_09_00_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2021_04_29_00_hotfixes.sql b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_04_29_00_hotfixes.sql
index b5f8b6b8656..b5f8b6b8656 100644
--- a/sql/updates/hotfixes/master/2021_04_29_00_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_04_29_00_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2021_05_04_00_hotfixes.sql b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_05_04_00_hotfixes.sql
index a90452ee7eb..a90452ee7eb 100644
--- a/sql/updates/hotfixes/master/2021_05_04_00_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_05_04_00_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2021_05_04_01_hotfixes.sql b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_05_04_01_hotfixes.sql
index c1ad31b3040..c1ad31b3040 100644
--- a/sql/updates/hotfixes/master/2021_05_04_01_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_05_04_01_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2021_05_05_00_hotfixes.sql b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_05_05_00_hotfixes.sql
index d353832d1f6..d353832d1f6 100644
--- a/sql/updates/hotfixes/master/2021_05_05_00_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_05_05_00_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2021_05_06_00_hotfixes.sql b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_05_06_00_hotfixes.sql
index dc470d8cc9f..dc470d8cc9f 100644
--- a/sql/updates/hotfixes/master/2021_05_06_00_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_05_06_00_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2021_05_06_01_hotfixes.sql b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_05_06_01_hotfixes.sql
index 9a699c4c7cc..9a699c4c7cc 100644
--- a/sql/updates/hotfixes/master/2021_05_06_01_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_05_06_01_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2021_05_07_00_hotfixes.sql b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_05_07_00_hotfixes.sql
index 7dc955baeb3..7dc955baeb3 100644
--- a/sql/updates/hotfixes/master/2021_05_07_00_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_05_07_00_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2021_05_07_01_hotfixes.sql b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_05_07_01_hotfixes.sql
index 5a7484f27dc..5a7484f27dc 100644
--- a/sql/updates/hotfixes/master/2021_05_07_01_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_05_07_01_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2021_05_07_02_hotfixes.sql b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_05_07_02_hotfixes.sql
index 80185877568..80185877568 100644
--- a/sql/updates/hotfixes/master/2021_05_07_02_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_05_07_02_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2021_05_09_00_hotfixes.sql b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_05_09_00_hotfixes.sql
index 45b7bdc1a2d..45b7bdc1a2d 100644
--- a/sql/updates/hotfixes/master/2021_05_09_00_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_05_09_00_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2021_05_09_01_hotfixes.sql b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_05_09_01_hotfixes.sql
index 302b28e57d8..302b28e57d8 100644
--- a/sql/updates/hotfixes/master/2021_05_09_01_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_05_09_01_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2021_05_10_00_hotfixes.sql b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_05_10_00_hotfixes.sql
index b657aecac4b..b657aecac4b 100644
--- a/sql/updates/hotfixes/master/2021_05_10_00_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_05_10_00_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2021_05_10_01_hotfixes.sql b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_05_10_01_hotfixes.sql
index 65be6decfb2..65be6decfb2 100644
--- a/sql/updates/hotfixes/master/2021_05_10_01_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_05_10_01_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2021_05_10_02_hotfixes.sql b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_05_10_02_hotfixes.sql
index 3e36a31be17..3e36a31be17 100644
--- a/sql/updates/hotfixes/master/2021_05_10_02_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_05_10_02_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2021_05_10_03_hotfixes.sql b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_05_10_03_hotfixes.sql
index e8009687508..e8009687508 100644
--- a/sql/updates/hotfixes/master/2021_05_10_03_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_05_10_03_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2021_05_10_04_hotfixes.sql b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_05_10_04_hotfixes.sql
index 92ae9a814a5..92ae9a814a5 100644
--- a/sql/updates/hotfixes/master/2021_05_10_04_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_05_10_04_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2021_05_10_05_hotfixes.sql b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_05_10_05_hotfixes.sql
index 8ca7e92de03..8ca7e92de03 100644
--- a/sql/updates/hotfixes/master/2021_05_10_05_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_05_10_05_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2021_05_10_06_hotfixes.sql b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_05_10_06_hotfixes.sql
index 92034b563bb..92034b563bb 100644
--- a/sql/updates/hotfixes/master/2021_05_10_06_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_05_10_06_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2021_05_10_07_hotfixes.sql b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_05_10_07_hotfixes.sql
index 97d48193f0c..97d48193f0c 100644
--- a/sql/updates/hotfixes/master/2021_05_10_07_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_05_10_07_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2021_05_10_08_hotfixes.sql b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_05_10_08_hotfixes.sql
index f6e0bef20ac..f6e0bef20ac 100644
--- a/sql/updates/hotfixes/master/2021_05_10_08_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_05_10_08_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2021_05_10_09_hotfixes.sql b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_05_10_09_hotfixes.sql
index 23ca7bc42cb..23ca7bc42cb 100644
--- a/sql/updates/hotfixes/master/2021_05_10_09_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_05_10_09_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2021_05_10_10_hotfixes.sql b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_05_10_10_hotfixes.sql
index f5bb5f6c22e..f5bb5f6c22e 100644
--- a/sql/updates/hotfixes/master/2021_05_10_10_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_05_10_10_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2021_05_10_11_hotfixes.sql b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_05_10_11_hotfixes.sql
index aa021ede0ff..aa021ede0ff 100644
--- a/sql/updates/hotfixes/master/2021_05_10_11_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_05_10_11_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2021_05_14_00_hotfixes.sql b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_05_14_00_hotfixes.sql
index 0e68c39969d..0e68c39969d 100644
--- a/sql/updates/hotfixes/master/2021_05_14_00_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_05_14_00_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2021_05_17_00_hotfixes.sql b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_05_17_00_hotfixes.sql
index 443009ad21b..443009ad21b 100644
--- a/sql/updates/hotfixes/master/2021_05_17_00_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_05_17_00_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2021_05_17_01_hotfixes.sql b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_05_17_01_hotfixes.sql
index 31a0d23992a..31a0d23992a 100644
--- a/sql/updates/hotfixes/master/2021_05_17_01_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_05_17_01_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2021_05_17_02_hotfixes.sql b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_05_17_02_hotfixes.sql
index eb7b9894b10..eb7b9894b10 100644
--- a/sql/updates/hotfixes/master/2021_05_17_02_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_05_17_02_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2021_05_17_03_hotfixes.sql b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_05_17_03_hotfixes.sql
index 4766895b389..4766895b389 100644
--- a/sql/updates/hotfixes/master/2021_05_17_03_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_05_17_03_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2021_05_17_04_hotfixes.sql b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_05_17_04_hotfixes.sql
index a1722b4169e..a1722b4169e 100644
--- a/sql/updates/hotfixes/master/2021_05_17_04_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_05_17_04_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2021_05_17_05_hotfixes.sql b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_05_17_05_hotfixes.sql
index 0b39744e162..0b39744e162 100644
--- a/sql/updates/hotfixes/master/2021_05_17_05_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_05_17_05_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2021_05_17_06_hotfixes.sql b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_05_17_06_hotfixes.sql
index 647a4abf6b4..647a4abf6b4 100644
--- a/sql/updates/hotfixes/master/2021_05_17_06_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_05_17_06_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2021_05_17_07_hotfixes.sql b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_05_17_07_hotfixes.sql
index a5d9ca5a722..a5d9ca5a722 100644
--- a/sql/updates/hotfixes/master/2021_05_17_07_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_05_17_07_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2021_05_17_08_hotfixes.sql b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_05_17_08_hotfixes.sql
index 5f9110fd98e..5f9110fd98e 100644
--- a/sql/updates/hotfixes/master/2021_05_17_08_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_05_17_08_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2021_05_17_09_hotfixes.sql b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_05_17_09_hotfixes.sql
index 79a5684f55e..79a5684f55e 100644
--- a/sql/updates/hotfixes/master/2021_05_17_09_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_05_17_09_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2021_05_17_10_hotfixes.sql b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_05_17_10_hotfixes.sql
index 81253b049c5..81253b049c5 100644
--- a/sql/updates/hotfixes/master/2021_05_17_10_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_05_17_10_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2021_06_03_00_hotfixes.sql b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_06_03_00_hotfixes.sql
index 22f4606c274..22f4606c274 100644
--- a/sql/updates/hotfixes/master/2021_06_03_00_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_06_03_00_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2021_06_04_00_hotfixes.sql b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_06_04_00_hotfixes.sql
index e02eac85190..e02eac85190 100644
--- a/sql/updates/hotfixes/master/2021_06_04_00_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_06_04_00_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2021_06_04_01_hotfixes.sql b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_06_04_01_hotfixes.sql
index c0c6e8a73e0..c0c6e8a73e0 100644
--- a/sql/updates/hotfixes/master/2021_06_04_01_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_06_04_01_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2021_06_05_00_hotfixes.sql b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_06_05_00_hotfixes.sql
index 01e5a7995c5..01e5a7995c5 100644
--- a/sql/updates/hotfixes/master/2021_06_05_00_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_06_05_00_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2021_06_06_00_hotfixes.sql b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_06_06_00_hotfixes.sql
index 4f98b077074..4f98b077074 100644
--- a/sql/updates/hotfixes/master/2021_06_06_00_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_06_06_00_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2021_06_06_01_hotfixes.sql b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_06_06_01_hotfixes.sql
index c0c43673fdf..c0c43673fdf 100644
--- a/sql/updates/hotfixes/master/2021_06_06_01_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_06_06_01_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2021_06_06_02_hotfixes.sql b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_06_06_02_hotfixes.sql
index 05e18ed4cce..05e18ed4cce 100644
--- a/sql/updates/hotfixes/master/2021_06_06_02_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_06_06_02_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2021_06_06_03_hotfixes.sql b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_06_06_03_hotfixes.sql
index d3628207028..d3628207028 100644
--- a/sql/updates/hotfixes/master/2021_06_06_03_hotfixes.sql
+++ b/sql/old/9.x/hotfixes/20101_2021_07_04/2021_06_06_03_hotfixes.sql
diff --git a/sql/updates/world/master/2020_10_20_00_world.sql b/sql/old/9.x/world/20101_2021_07_04/2020_10_20_00_world.sql
index c4d1f3dc9a9..c4d1f3dc9a9 100644
--- a/sql/updates/world/master/2020_10_20_00_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2020_10_20_00_world.sql
diff --git a/sql/updates/world/master/2020_11_01_00_world_2017_10_05_03_world.sql b/sql/old/9.x/world/20101_2021_07_04/2020_11_01_00_world_2017_10_05_03_world.sql
index e0d9f683ba5..e0d9f683ba5 100644
--- a/sql/updates/world/master/2020_11_01_00_world_2017_10_05_03_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2020_11_01_00_world_2017_10_05_03_world.sql
diff --git a/sql/updates/world/master/2020_11_01_01_world_2017_10_05_04_world.sql b/sql/old/9.x/world/20101_2021_07_04/2020_11_01_01_world_2017_10_05_04_world.sql
index 93d60c3ac40..93d60c3ac40 100644
--- a/sql/updates/world/master/2020_11_01_01_world_2017_10_05_04_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2020_11_01_01_world_2017_10_05_04_world.sql
diff --git a/sql/updates/world/master/2020_11_01_02_world_2017_10_05_06_world.sql b/sql/old/9.x/world/20101_2021_07_04/2020_11_01_02_world_2017_10_05_06_world.sql
index ef799ba6987..ef799ba6987 100644
--- a/sql/updates/world/master/2020_11_01_02_world_2017_10_05_06_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2020_11_01_02_world_2017_10_05_06_world.sql
diff --git a/sql/updates/world/master/2020_11_01_03_world_2017_10_06_01_world.sql b/sql/old/9.x/world/20101_2021_07_04/2020_11_01_03_world_2017_10_06_01_world.sql
index b19a8acbfcc..b19a8acbfcc 100644
--- a/sql/updates/world/master/2020_11_01_03_world_2017_10_06_01_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2020_11_01_03_world_2017_10_06_01_world.sql
diff --git a/sql/updates/world/master/2020_11_01_04_world_2017_10_09_00_world.sql b/sql/old/9.x/world/20101_2021_07_04/2020_11_01_04_world_2017_10_09_00_world.sql
index 2854829fd67..2854829fd67 100644
--- a/sql/updates/world/master/2020_11_01_04_world_2017_10_09_00_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2020_11_01_04_world_2017_10_09_00_world.sql
diff --git a/sql/updates/world/master/2020_11_01_05_world_2017_10_10_02_world.sql b/sql/old/9.x/world/20101_2021_07_04/2020_11_01_05_world_2017_10_10_02_world.sql
index 0e6a88f3aa0..0e6a88f3aa0 100644
--- a/sql/updates/world/master/2020_11_01_05_world_2017_10_10_02_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2020_11_01_05_world_2017_10_10_02_world.sql
diff --git a/sql/updates/world/master/2020_11_01_06_world_2017_10_10_03_world.sql b/sql/old/9.x/world/20101_2021_07_04/2020_11_01_06_world_2017_10_10_03_world.sql
index af8d10b98fe..af8d10b98fe 100644
--- a/sql/updates/world/master/2020_11_01_06_world_2017_10_10_03_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2020_11_01_06_world_2017_10_10_03_world.sql
diff --git a/sql/updates/world/master/2020_11_01_07_world_2017_10_10_12_world.sql b/sql/old/9.x/world/20101_2021_07_04/2020_11_01_07_world_2017_10_10_12_world.sql
index 9f25861273e..9f25861273e 100644
--- a/sql/updates/world/master/2020_11_01_07_world_2017_10_10_12_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2020_11_01_07_world_2017_10_10_12_world.sql
diff --git a/sql/updates/world/master/2020_11_05_00_world.sql b/sql/old/9.x/world/20101_2021_07_04/2020_11_05_00_world.sql
index dcdfdbaeb7d..dcdfdbaeb7d 100644
--- a/sql/updates/world/master/2020_11_05_00_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2020_11_05_00_world.sql
diff --git a/sql/updates/world/master/2020_11_06_00_world_2017_10_10_04_world.sql b/sql/old/9.x/world/20101_2021_07_04/2020_11_06_00_world_2017_10_10_04_world.sql
index 0f4bbf46ee5..0f4bbf46ee5 100644
--- a/sql/updates/world/master/2020_11_06_00_world_2017_10_10_04_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2020_11_06_00_world_2017_10_10_04_world.sql
diff --git a/sql/updates/world/master/2020_11_06_01_world_2017_10_10_05_world_335.sql b/sql/old/9.x/world/20101_2021_07_04/2020_11_06_01_world_2017_10_10_05_world_335.sql
index eeccd688409..eeccd688409 100644
--- a/sql/updates/world/master/2020_11_06_01_world_2017_10_10_05_world_335.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2020_11_06_01_world_2017_10_10_05_world_335.sql
diff --git a/sql/updates/world/master/2020_11_06_02_world_2017_10_10_06_world_335.sql b/sql/old/9.x/world/20101_2021_07_04/2020_11_06_02_world_2017_10_10_06_world_335.sql
index 3ef162f0ded..3ef162f0ded 100644
--- a/sql/updates/world/master/2020_11_06_02_world_2017_10_10_06_world_335.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2020_11_06_02_world_2017_10_10_06_world_335.sql
diff --git a/sql/updates/world/master/2020_11_06_03_world_2017_10_10_07_world_335.sql b/sql/old/9.x/world/20101_2021_07_04/2020_11_06_03_world_2017_10_10_07_world_335.sql
index d69f55130a6..d69f55130a6 100644
--- a/sql/updates/world/master/2020_11_06_03_world_2017_10_10_07_world_335.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2020_11_06_03_world_2017_10_10_07_world_335.sql
diff --git a/sql/updates/world/master/2020_11_06_04_world_2017_10_10_08_world_335.sql b/sql/old/9.x/world/20101_2021_07_04/2020_11_06_04_world_2017_10_10_08_world_335.sql
index c10059222f1..c10059222f1 100644
--- a/sql/updates/world/master/2020_11_06_04_world_2017_10_10_08_world_335.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2020_11_06_04_world_2017_10_10_08_world_335.sql
diff --git a/sql/updates/world/master/2020_11_06_05_world_2017_10_10_09_world_335.sql b/sql/old/9.x/world/20101_2021_07_04/2020_11_06_05_world_2017_10_10_09_world_335.sql
index 036409082f1..036409082f1 100644
--- a/sql/updates/world/master/2020_11_06_05_world_2017_10_10_09_world_335.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2020_11_06_05_world_2017_10_10_09_world_335.sql
diff --git a/sql/updates/world/master/2020_11_06_06_world_2017_10_11_00_world.sql b/sql/old/9.x/world/20101_2021_07_04/2020_11_06_06_world_2017_10_11_00_world.sql
index 47b9b0ab6e3..47b9b0ab6e3 100644
--- a/sql/updates/world/master/2020_11_06_06_world_2017_10_11_00_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2020_11_06_06_world_2017_10_11_00_world.sql
diff --git a/sql/updates/world/master/2020_11_07_00_world_2017_10_13_01_world.sql b/sql/old/9.x/world/20101_2021_07_04/2020_11_07_00_world_2017_10_13_01_world.sql
index 82c96282f16..82c96282f16 100644
--- a/sql/updates/world/master/2020_11_07_00_world_2017_10_13_01_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2020_11_07_00_world_2017_10_13_01_world.sql
diff --git a/sql/updates/world/master/2020_11_08_00_world_2017_10_13_02_world.sql b/sql/old/9.x/world/20101_2021_07_04/2020_11_08_00_world_2017_10_13_02_world.sql
index e8cd23022ef..e8cd23022ef 100644
--- a/sql/updates/world/master/2020_11_08_00_world_2017_10_13_02_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2020_11_08_00_world_2017_10_13_02_world.sql
diff --git a/sql/updates/world/master/2020_11_08_01_world_2017_10_13_04_world_335.sql b/sql/old/9.x/world/20101_2021_07_04/2020_11_08_01_world_2017_10_13_04_world_335.sql
index e5041dd5143..e5041dd5143 100644
--- a/sql/updates/world/master/2020_11_08_01_world_2017_10_13_04_world_335.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2020_11_08_01_world_2017_10_13_04_world_335.sql
diff --git a/sql/updates/world/master/2020_11_08_02_world_2017_10_13_08_world.sql b/sql/old/9.x/world/20101_2021_07_04/2020_11_08_02_world_2017_10_13_08_world.sql
index f186c9dd6a7..f186c9dd6a7 100644
--- a/sql/updates/world/master/2020_11_08_02_world_2017_10_13_08_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2020_11_08_02_world_2017_10_13_08_world.sql
diff --git a/sql/updates/world/master/2020_12_09_00_world.sql b/sql/old/9.x/world/20101_2021_07_04/2020_12_09_00_world.sql
index f49fc758417..f49fc758417 100644
--- a/sql/updates/world/master/2020_12_09_00_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2020_12_09_00_world.sql
diff --git a/sql/updates/world/master/2020_12_16_00_world.sql b/sql/old/9.x/world/20101_2021_07_04/2020_12_16_00_world.sql
index 2203a9375b1..2203a9375b1 100644
--- a/sql/updates/world/master/2020_12_16_00_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2020_12_16_00_world.sql
diff --git a/sql/updates/world/master/2020_12_18_00_world.sql b/sql/old/9.x/world/20101_2021_07_04/2020_12_18_00_world.sql
index 98fe34ff271..98fe34ff271 100644
--- a/sql/updates/world/master/2020_12_18_00_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2020_12_18_00_world.sql
diff --git a/sql/updates/world/master/2020_12_18_01_world.sql b/sql/old/9.x/world/20101_2021_07_04/2020_12_18_01_world.sql
index 08af731c350..08af731c350 100644
--- a/sql/updates/world/master/2020_12_18_01_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2020_12_18_01_world.sql
diff --git a/sql/updates/world/master/2020_12_18_02_world.sql b/sql/old/9.x/world/20101_2021_07_04/2020_12_18_02_world.sql
index 2a6ff0c0b41..2a6ff0c0b41 100644
--- a/sql/updates/world/master/2020_12_18_02_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2020_12_18_02_world.sql
diff --git a/sql/updates/world/master/2020_12_23_00_world.sql b/sql/old/9.x/world/20101_2021_07_04/2020_12_23_00_world.sql
index 368d91febb1..368d91febb1 100644
--- a/sql/updates/world/master/2020_12_23_00_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2020_12_23_00_world.sql
diff --git a/sql/updates/world/master/2020_12_23_01_world.sql b/sql/old/9.x/world/20101_2021_07_04/2020_12_23_01_world.sql
index 6e3564ce1bc..6e3564ce1bc 100644
--- a/sql/updates/world/master/2020_12_23_01_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2020_12_23_01_world.sql
diff --git a/sql/updates/world/master/2020_12_23_02_world.sql b/sql/old/9.x/world/20101_2021_07_04/2020_12_23_02_world.sql
index 35c952a3d41..35c952a3d41 100644
--- a/sql/updates/world/master/2020_12_23_02_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2020_12_23_02_world.sql
diff --git a/sql/updates/world/master/2020_12_24_00_world.sql b/sql/old/9.x/world/20101_2021_07_04/2020_12_24_00_world.sql
index 56ec8c8f50a..56ec8c8f50a 100644
--- a/sql/updates/world/master/2020_12_24_00_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2020_12_24_00_world.sql
diff --git a/sql/updates/world/master/2020_12_24_01_world.sql b/sql/old/9.x/world/20101_2021_07_04/2020_12_24_01_world.sql
index 5a9c83377f5..5a9c83377f5 100644
--- a/sql/updates/world/master/2020_12_24_01_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2020_12_24_01_world.sql
diff --git a/sql/updates/world/master/2020_12_25_00_world.sql b/sql/old/9.x/world/20101_2021_07_04/2020_12_25_00_world.sql
index 19f76f515c7..19f76f515c7 100644
--- a/sql/updates/world/master/2020_12_25_00_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2020_12_25_00_world.sql
diff --git a/sql/updates/world/master/2020_12_25_01_world.sql b/sql/old/9.x/world/20101_2021_07_04/2020_12_25_01_world.sql
index cc41b79ebfe..cc41b79ebfe 100644
--- a/sql/updates/world/master/2020_12_25_01_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2020_12_25_01_world.sql
diff --git a/sql/updates/world/master/2020_12_27_00_world.sql b/sql/old/9.x/world/20101_2021_07_04/2020_12_27_00_world.sql
index 7c1acf57c9a..7c1acf57c9a 100644
--- a/sql/updates/world/master/2020_12_27_00_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2020_12_27_00_world.sql
diff --git a/sql/updates/world/master/2020_12_31_00_world.sql b/sql/old/9.x/world/20101_2021_07_04/2020_12_31_00_world.sql
index b974c0abba2..b974c0abba2 100644
--- a/sql/updates/world/master/2020_12_31_00_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2020_12_31_00_world.sql
diff --git a/sql/updates/world/master/2021_01_02_00_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_02_00_world.sql
index b8e9d7b07cc..b8e9d7b07cc 100644
--- a/sql/updates/world/master/2021_01_02_00_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_02_00_world.sql
diff --git a/sql/updates/world/master/2021_01_05_00_world_2017_10_15_00_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_05_00_world_2017_10_15_00_world.sql
index f459673ba40..f459673ba40 100644
--- a/sql/updates/world/master/2021_01_05_00_world_2017_10_15_00_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_05_00_world_2017_10_15_00_world.sql
diff --git a/sql/updates/world/master/2021_01_05_01_world_2017_10_16_01_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_05_01_world_2017_10_16_01_world.sql
index 0a9eb397d14..0a9eb397d14 100644
--- a/sql/updates/world/master/2021_01_05_01_world_2017_10_16_01_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_05_01_world_2017_10_16_01_world.sql
diff --git a/sql/updates/world/master/2021_01_05_02_world_2017_10_16_02_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_05_02_world_2017_10_16_02_world.sql
index 30ea73d9307..30ea73d9307 100644
--- a/sql/updates/world/master/2021_01_05_02_world_2017_10_16_02_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_05_02_world_2017_10_16_02_world.sql
diff --git a/sql/updates/world/master/2021_01_05_03_world_2017_10_16_03_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_05_03_world_2017_10_16_03_world.sql
index fd11549221e..fd11549221e 100644
--- a/sql/updates/world/master/2021_01_05_03_world_2017_10_16_03_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_05_03_world_2017_10_16_03_world.sql
diff --git a/sql/updates/world/master/2021_01_05_04_world_2017_10_19_00_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_05_04_world_2017_10_19_00_world.sql
index c7f2e7c3cc7..c7f2e7c3cc7 100644
--- a/sql/updates/world/master/2021_01_05_04_world_2017_10_19_00_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_05_04_world_2017_10_19_00_world.sql
diff --git a/sql/updates/world/master/2021_01_05_05_world_2017_10_19_01_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_05_05_world_2017_10_19_01_world.sql
index 031c116fe2a..031c116fe2a 100644
--- a/sql/updates/world/master/2021_01_05_05_world_2017_10_19_01_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_05_05_world_2017_10_19_01_world.sql
diff --git a/sql/updates/world/master/2021_01_05_06_world_2017_10_19_02_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_05_06_world_2017_10_19_02_world.sql
index 9566bafcd81..9566bafcd81 100644
--- a/sql/updates/world/master/2021_01_05_06_world_2017_10_19_02_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_05_06_world_2017_10_19_02_world.sql
diff --git a/sql/updates/world/master/2021_01_06_00_world_2017_10_19_03_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_06_00_world_2017_10_19_03_world.sql
index 0a88f09568f..0a88f09568f 100644
--- a/sql/updates/world/master/2021_01_06_00_world_2017_10_19_03_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_06_00_world_2017_10_19_03_world.sql
diff --git a/sql/updates/world/master/2021_01_06_01_world_2017_10_19_04_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_06_01_world_2017_10_19_04_world.sql
index 69c7c5b1e6b..69c7c5b1e6b 100644
--- a/sql/updates/world/master/2021_01_06_01_world_2017_10_19_04_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_06_01_world_2017_10_19_04_world.sql
diff --git a/sql/updates/world/master/2021_01_06_02_world_2017_10_19_05_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_06_02_world_2017_10_19_05_world.sql
index d36e89ddc3e..d36e89ddc3e 100644
--- a/sql/updates/world/master/2021_01_06_02_world_2017_10_19_05_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_06_02_world_2017_10_19_05_world.sql
diff --git a/sql/updates/world/master/2021_01_06_03_world_2017_10_19_09_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_06_03_world_2017_10_19_09_world.sql
index 2e02d084afb..2e02d084afb 100644
--- a/sql/updates/world/master/2021_01_06_03_world_2017_10_19_09_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_06_03_world_2017_10_19_09_world.sql
diff --git a/sql/updates/world/master/2021_01_06_04_world_2017_10_19_10_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_06_04_world_2017_10_19_10_world.sql
index c87ee3accd3..c87ee3accd3 100644
--- a/sql/updates/world/master/2021_01_06_04_world_2017_10_19_10_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_06_04_world_2017_10_19_10_world.sql
diff --git a/sql/updates/world/master/2021_01_06_05_world_2017_10_21_00_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_06_05_world_2017_10_21_00_world.sql
index af01da5c0de..af01da5c0de 100644
--- a/sql/updates/world/master/2021_01_06_05_world_2017_10_21_00_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_06_05_world_2017_10_21_00_world.sql
diff --git a/sql/updates/world/master/2021_01_06_06_world_2017_10_21_01_world_335.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_06_06_world_2017_10_21_01_world_335.sql
index ffd3968392f..ffd3968392f 100644
--- a/sql/updates/world/master/2021_01_06_06_world_2017_10_21_01_world_335.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_06_06_world_2017_10_21_01_world_335.sql
diff --git a/sql/updates/world/master/2021_01_07_00_world_2017_10_21_02_world_335.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_07_00_world_2017_10_21_02_world_335.sql
index d9fb48c4c2f..d9fb48c4c2f 100644
--- a/sql/updates/world/master/2021_01_07_00_world_2017_10_21_02_world_335.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_07_00_world_2017_10_21_02_world_335.sql
diff --git a/sql/updates/world/master/2021_01_07_01_world_2017_10_21_03_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_07_01_world_2017_10_21_03_world.sql
index 34176d34678..34176d34678 100644
--- a/sql/updates/world/master/2021_01_07_01_world_2017_10_21_03_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_07_01_world_2017_10_21_03_world.sql
diff --git a/sql/updates/world/master/2021_01_07_02_world_2017_10_21_04_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_07_02_world_2017_10_21_04_world.sql
index e2996ee0870..e2996ee0870 100644
--- a/sql/updates/world/master/2021_01_07_02_world_2017_10_21_04_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_07_02_world_2017_10_21_04_world.sql
diff --git a/sql/updates/world/master/2021_01_07_03_world_2017_10_21_06_world_335.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_07_03_world_2017_10_21_06_world_335.sql
index 371b0a1131d..371b0a1131d 100644
--- a/sql/updates/world/master/2021_01_07_03_world_2017_10_21_06_world_335.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_07_03_world_2017_10_21_06_world_335.sql
diff --git a/sql/updates/world/master/2021_01_07_04_world_2017_10_21_08_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_07_04_world_2017_10_21_08_world.sql
index 78c3173a571..78c3173a571 100644
--- a/sql/updates/world/master/2021_01_07_04_world_2017_10_21_08_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_07_04_world_2017_10_21_08_world.sql
diff --git a/sql/updates/world/master/2021_01_07_05_world_2017_10_21_09_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_07_05_world_2017_10_21_09_world.sql
index 756f75a6c1a..756f75a6c1a 100644
--- a/sql/updates/world/master/2021_01_07_05_world_2017_10_21_09_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_07_05_world_2017_10_21_09_world.sql
diff --git a/sql/updates/world/master/2021_01_07_06_world_2017_10_21_11_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_07_06_world_2017_10_21_11_world.sql
index 004109cadf0..004109cadf0 100644
--- a/sql/updates/world/master/2021_01_07_06_world_2017_10_21_11_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_07_06_world_2017_10_21_11_world.sql
diff --git a/sql/updates/world/master/2021_01_07_07_world_2017_10_21_14_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_07_07_world_2017_10_21_14_world.sql
index 76b87cd5e4d..76b87cd5e4d 100644
--- a/sql/updates/world/master/2021_01_07_07_world_2017_10_21_14_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_07_07_world_2017_10_21_14_world.sql
diff --git a/sql/updates/world/master/2021_01_09_00_world_2017_10_22_00_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_09_00_world_2017_10_22_00_world.sql
index 7dbd71c3e73..7dbd71c3e73 100644
--- a/sql/updates/world/master/2021_01_09_00_world_2017_10_22_00_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_09_00_world_2017_10_22_00_world.sql
diff --git a/sql/updates/world/master/2021_01_09_01_world_2017_10_22_01_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_09_01_world_2017_10_22_01_world.sql
index cd293e88b2e..cd293e88b2e 100644
--- a/sql/updates/world/master/2021_01_09_01_world_2017_10_22_01_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_09_01_world_2017_10_22_01_world.sql
diff --git a/sql/updates/world/master/2021_01_09_02_world_2017_10_22_02_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_09_02_world_2017_10_22_02_world.sql
index ce485b5b7ad..ce485b5b7ad 100644
--- a/sql/updates/world/master/2021_01_09_02_world_2017_10_22_02_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_09_02_world_2017_10_22_02_world.sql
diff --git a/sql/updates/world/master/2021_01_09_03_world_2017_10_22_03_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_09_03_world_2017_10_22_03_world.sql
index a421d9d8b06..a421d9d8b06 100644
--- a/sql/updates/world/master/2021_01_09_03_world_2017_10_22_03_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_09_03_world_2017_10_22_03_world.sql
diff --git a/sql/updates/world/master/2021_01_09_04_world_2017_10_22_04_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_09_04_world_2017_10_22_04_world.sql
index b098d2cb30c..b098d2cb30c 100644
--- a/sql/updates/world/master/2021_01_09_04_world_2017_10_22_04_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_09_04_world_2017_10_22_04_world.sql
diff --git a/sql/updates/world/master/2021_01_09_05_world_2017_10_22_05_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_09_05_world_2017_10_22_05_world.sql
index 24ef75ff4dc..24ef75ff4dc 100644
--- a/sql/updates/world/master/2021_01_09_05_world_2017_10_22_05_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_09_05_world_2017_10_22_05_world.sql
diff --git a/sql/updates/world/master/2021_01_09_06_world_2017_10_22_07_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_09_06_world_2017_10_22_07_world.sql
index 1ca509fe43a..1ca509fe43a 100644
--- a/sql/updates/world/master/2021_01_09_06_world_2017_10_22_07_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_09_06_world_2017_10_22_07_world.sql
diff --git a/sql/updates/world/master/2021_01_09_07_world_2017_10_23_00_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_09_07_world_2017_10_23_00_world.sql
index 28c5ea59d69..28c5ea59d69 100644
--- a/sql/updates/world/master/2021_01_09_07_world_2017_10_23_00_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_09_07_world_2017_10_23_00_world.sql
diff --git a/sql/updates/world/master/2021_01_09_08_world_2017_10_23_01_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_09_08_world_2017_10_23_01_world.sql
index 22c5da04370..22c5da04370 100644
--- a/sql/updates/world/master/2021_01_09_08_world_2017_10_23_01_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_09_08_world_2017_10_23_01_world.sql
diff --git a/sql/updates/world/master/2021_01_09_09_world_2017_10_23_05_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_09_09_world_2017_10_23_05_world.sql
index f43a64444da..f43a64444da 100644
--- a/sql/updates/world/master/2021_01_09_09_world_2017_10_23_05_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_09_09_world_2017_10_23_05_world.sql
diff --git a/sql/updates/world/master/2021_01_09_10_world_2017_10_23_06_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_09_10_world_2017_10_23_06_world.sql
index 622b3c17428..622b3c17428 100644
--- a/sql/updates/world/master/2021_01_09_10_world_2017_10_23_06_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_09_10_world_2017_10_23_06_world.sql
diff --git a/sql/updates/world/master/2021_01_09_11_world_2017_10_23_08_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_09_11_world_2017_10_23_08_world.sql
index 52e07d15a43..52e07d15a43 100644
--- a/sql/updates/world/master/2021_01_09_11_world_2017_10_23_08_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_09_11_world_2017_10_23_08_world.sql
diff --git a/sql/updates/world/master/2021_01_09_12_world_2017_10_24_00_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_09_12_world_2017_10_24_00_world.sql
index 45dbe6473e5..45dbe6473e5 100644
--- a/sql/updates/world/master/2021_01_09_12_world_2017_10_24_00_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_09_12_world_2017_10_24_00_world.sql
diff --git a/sql/updates/world/master/2021_01_09_13_world_2017_10_24_01_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_09_13_world_2017_10_24_01_world.sql
index e1578119b46..e1578119b46 100644
--- a/sql/updates/world/master/2021_01_09_13_world_2017_10_24_01_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_09_13_world_2017_10_24_01_world.sql
diff --git a/sql/updates/world/master/2021_01_09_14_world_2017_10_24_02_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_09_14_world_2017_10_24_02_world.sql
index 8c2cc6bb692..8c2cc6bb692 100644
--- a/sql/updates/world/master/2021_01_09_14_world_2017_10_24_02_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_09_14_world_2017_10_24_02_world.sql
diff --git a/sql/updates/world/master/2021_01_09_15_world_2017_10_24_03_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_09_15_world_2017_10_24_03_world.sql
index 50a8a698702..50a8a698702 100644
--- a/sql/updates/world/master/2021_01_09_15_world_2017_10_24_03_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_09_15_world_2017_10_24_03_world.sql
diff --git a/sql/updates/world/master/2021_01_09_16_world_2017_10_24_04_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_09_16_world_2017_10_24_04_world.sql
index 8ff4ef457f7..8ff4ef457f7 100644
--- a/sql/updates/world/master/2021_01_09_16_world_2017_10_24_04_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_09_16_world_2017_10_24_04_world.sql
diff --git a/sql/updates/world/master/2021_01_09_17_world_2017_10_24_09_world_335.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_09_17_world_2017_10_24_09_world_335.sql
index ca359f2ce4a..ca359f2ce4a 100644
--- a/sql/updates/world/master/2021_01_09_17_world_2017_10_24_09_world_335.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_09_17_world_2017_10_24_09_world_335.sql
diff --git a/sql/updates/world/master/2021_01_09_18_world_2017_10_25_01_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_09_18_world_2017_10_25_01_world.sql
index 05d1a64d5c2..05d1a64d5c2 100644
--- a/sql/updates/world/master/2021_01_09_18_world_2017_10_25_01_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_09_18_world_2017_10_25_01_world.sql
diff --git a/sql/updates/world/master/2021_01_09_19_world_2017_10_25_02_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_09_19_world_2017_10_25_02_world.sql
index f8ee4e5cdac..f8ee4e5cdac 100644
--- a/sql/updates/world/master/2021_01_09_19_world_2017_10_25_02_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_09_19_world_2017_10_25_02_world.sql
diff --git a/sql/updates/world/master/2021_01_11_00_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_11_00_world.sql
index dda3bac6d4b..dda3bac6d4b 100644
--- a/sql/updates/world/master/2021_01_11_00_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_11_00_world.sql
diff --git a/sql/updates/world/master/2021_01_11_01_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_11_01_world.sql
index f76b4949d73..f76b4949d73 100644
--- a/sql/updates/world/master/2021_01_11_01_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_11_01_world.sql
diff --git a/sql/updates/world/master/2021_01_15_00_world_2017_10_26_00_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_15_00_world_2017_10_26_00_world.sql
index 330674fbbba..330674fbbba 100644
--- a/sql/updates/world/master/2021_01_15_00_world_2017_10_26_00_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_15_00_world_2017_10_26_00_world.sql
diff --git a/sql/updates/world/master/2021_01_15_01_world_2017_10_27_00_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_15_01_world_2017_10_27_00_world.sql
index 90558be747a..90558be747a 100644
--- a/sql/updates/world/master/2021_01_15_01_world_2017_10_27_00_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_15_01_world_2017_10_27_00_world.sql
diff --git a/sql/updates/world/master/2021_01_16_00_world_2017_10_27_01_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_16_00_world_2017_10_27_01_world.sql
index 09289304c1e..09289304c1e 100644
--- a/sql/updates/world/master/2021_01_16_00_world_2017_10_27_01_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_16_00_world_2017_10_27_01_world.sql
diff --git a/sql/updates/world/master/2021_01_16_01_world_2017_10_28_00_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_16_01_world_2017_10_28_00_world.sql
index 9c82634d8e0..9c82634d8e0 100644
--- a/sql/updates/world/master/2021_01_16_01_world_2017_10_28_00_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_16_01_world_2017_10_28_00_world.sql
diff --git a/sql/updates/world/master/2021_01_16_02_world_2017_10_28_01_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_16_02_world_2017_10_28_01_world.sql
index b3e0b6def08..b3e0b6def08 100644
--- a/sql/updates/world/master/2021_01_16_02_world_2017_10_28_01_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_16_02_world_2017_10_28_01_world.sql
diff --git a/sql/updates/world/master/2021_01_16_03_world_2017_10_28_02_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_16_03_world_2017_10_28_02_world.sql
index b7795832052..b7795832052 100644
--- a/sql/updates/world/master/2021_01_16_03_world_2017_10_28_02_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_16_03_world_2017_10_28_02_world.sql
diff --git a/sql/updates/world/master/2021_01_16_04_world_2017_10_28_04_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_16_04_world_2017_10_28_04_world.sql
index e5985d3b4e4..e5985d3b4e4 100644
--- a/sql/updates/world/master/2021_01_16_04_world_2017_10_28_04_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_16_04_world_2017_10_28_04_world.sql
diff --git a/sql/updates/world/master/2021_01_16_05_world_2017_10_28_05_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_16_05_world_2017_10_28_05_world.sql
index 7784fef1561..7784fef1561 100644
--- a/sql/updates/world/master/2021_01_16_05_world_2017_10_28_05_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_16_05_world_2017_10_28_05_world.sql
diff --git a/sql/updates/world/master/2021_01_16_06_world_2017_10_29_00_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_16_06_world_2017_10_29_00_world.sql
index 7f2f287a1ad..7f2f287a1ad 100644
--- a/sql/updates/world/master/2021_01_16_06_world_2017_10_29_00_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_16_06_world_2017_10_29_00_world.sql
diff --git a/sql/updates/world/master/2021_01_16_07_world_2017_10_29_03_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_16_07_world_2017_10_29_03_world.sql
index fa7fe4061ff..fa7fe4061ff 100644
--- a/sql/updates/world/master/2021_01_16_07_world_2017_10_29_03_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_16_07_world_2017_10_29_03_world.sql
diff --git a/sql/updates/world/master/2021_01_16_08_world_2017_10_29_04_world_335.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_16_08_world_2017_10_29_04_world_335.sql
index 753c2f5a1c5..753c2f5a1c5 100644
--- a/sql/updates/world/master/2021_01_16_08_world_2017_10_29_04_world_335.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_16_08_world_2017_10_29_04_world_335.sql
diff --git a/sql/updates/world/master/2021_01_16_09_world_2017_10_29_05_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_16_09_world_2017_10_29_05_world.sql
index 5995ef0c624..5995ef0c624 100644
--- a/sql/updates/world/master/2021_01_16_09_world_2017_10_29_05_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_16_09_world_2017_10_29_05_world.sql
diff --git a/sql/updates/world/master/2021_01_17_00_world_2017_10_29_09_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_17_00_world_2017_10_29_09_world.sql
index 6d20d8f7dae..6d20d8f7dae 100644
--- a/sql/updates/world/master/2021_01_17_00_world_2017_10_29_09_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_17_00_world_2017_10_29_09_world.sql
diff --git a/sql/updates/world/master/2021_01_18_00_world_2017_10_30_00_world_335.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_18_00_world_2017_10_30_00_world_335.sql
index 55099e3efcd..55099e3efcd 100644
--- a/sql/updates/world/master/2021_01_18_00_world_2017_10_30_00_world_335.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_18_00_world_2017_10_30_00_world_335.sql
diff --git a/sql/updates/world/master/2021_01_20_00_world_2017_10_31_02_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_20_00_world_2017_10_31_02_world.sql
index 269cb0551bd..269cb0551bd 100644
--- a/sql/updates/world/master/2021_01_20_00_world_2017_10_31_02_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_20_00_world_2017_10_31_02_world.sql
diff --git a/sql/updates/world/master/2021_01_20_01_world_2017_10_31_03_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_20_01_world_2017_10_31_03_world.sql
index 2c9cac0c146..2c9cac0c146 100644
--- a/sql/updates/world/master/2021_01_20_01_world_2017_10_31_03_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_20_01_world_2017_10_31_03_world.sql
diff --git a/sql/updates/world/master/2021_01_20_02_world_2017_11_01_00_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_20_02_world_2017_11_01_00_world.sql
index f027eaf6c38..f027eaf6c38 100644
--- a/sql/updates/world/master/2021_01_20_02_world_2017_11_01_00_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_20_02_world_2017_11_01_00_world.sql
diff --git a/sql/updates/world/master/2021_01_20_03_world_2017_11_01_01_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_20_03_world_2017_11_01_01_world.sql
index 7259d0d2c01..7259d0d2c01 100644
--- a/sql/updates/world/master/2021_01_20_03_world_2017_11_01_01_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_20_03_world_2017_11_01_01_world.sql
diff --git a/sql/updates/world/master/2021_01_23_00_world_2017_11_01_03_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_23_00_world_2017_11_01_03_world.sql
index 76b7b80a8f2..76b7b80a8f2 100644
--- a/sql/updates/world/master/2021_01_23_00_world_2017_11_01_03_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_23_00_world_2017_11_01_03_world.sql
diff --git a/sql/updates/world/master/2021_01_24_00_world_2017_11_01_09_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_24_00_world_2017_11_01_09_world.sql
index 52ad62f3188..52ad62f3188 100644
--- a/sql/updates/world/master/2021_01_24_00_world_2017_11_01_09_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_24_00_world_2017_11_01_09_world.sql
diff --git a/sql/updates/world/master/2021_01_24_01_world_2017_11_01_10_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_24_01_world_2017_11_01_10_world.sql
index 89b3253b43d..89b3253b43d 100644
--- a/sql/updates/world/master/2021_01_24_01_world_2017_11_01_10_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_24_01_world_2017_11_01_10_world.sql
diff --git a/sql/updates/world/master/2021_01_24_02_world_2017_11_01_12_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_24_02_world_2017_11_01_12_world.sql
index c74d9073ce0..c74d9073ce0 100644
--- a/sql/updates/world/master/2021_01_24_02_world_2017_11_01_12_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_24_02_world_2017_11_01_12_world.sql
diff --git a/sql/updates/world/master/2021_01_24_03_world_2017_11_01_13_world_335.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_24_03_world_2017_11_01_13_world_335.sql
index a00e634d157..a00e634d157 100644
--- a/sql/updates/world/master/2021_01_24_03_world_2017_11_01_13_world_335.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_24_03_world_2017_11_01_13_world_335.sql
diff --git a/sql/updates/world/master/2021_01_24_04_world_2017_11_02_00_world_335.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_24_04_world_2017_11_02_00_world_335.sql
index 3bc3c64f72b..3bc3c64f72b 100644
--- a/sql/updates/world/master/2021_01_24_04_world_2017_11_02_00_world_335.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_24_04_world_2017_11_02_00_world_335.sql
diff --git a/sql/updates/world/master/2021_01_24_05_world_2017_11_03_00_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_24_05_world_2017_11_03_00_world.sql
index 7022d21c390..7022d21c390 100644
--- a/sql/updates/world/master/2021_01_24_05_world_2017_11_03_00_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_24_05_world_2017_11_03_00_world.sql
diff --git a/sql/updates/world/master/2021_01_25_00_world_gameobject_anim_kit_structure.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_25_00_world_gameobject_anim_kit_structure.sql
index 5fe01ed0238..5fe01ed0238 100644
--- a/sql/updates/world/master/2021_01_25_00_world_gameobject_anim_kit_structure.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_25_00_world_gameobject_anim_kit_structure.sql
diff --git a/sql/updates/world/master/2021_01_25_01_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_25_01_world.sql
index 9cecc94c3eb..9cecc94c3eb 100644
--- a/sql/updates/world/master/2021_01_25_01_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_25_01_world.sql
diff --git a/sql/updates/world/master/2021_01_25_02_world_2017_11_05_00_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_25_02_world_2017_11_05_00_world.sql
index 41eb58da266..41eb58da266 100644
--- a/sql/updates/world/master/2021_01_25_02_world_2017_11_05_00_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_25_02_world_2017_11_05_00_world.sql
diff --git a/sql/updates/world/master/2021_01_25_03_world_2017_11_05_01_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_25_03_world_2017_11_05_01_world.sql
index 562a0e4c249..562a0e4c249 100644
--- a/sql/updates/world/master/2021_01_25_03_world_2017_11_05_01_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_25_03_world_2017_11_05_01_world.sql
diff --git a/sql/updates/world/master/2021_01_25_04_world_2017_11_06_00_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_25_04_world_2017_11_06_00_world.sql
index 90e36b54455..90e36b54455 100644
--- a/sql/updates/world/master/2021_01_25_04_world_2017_11_06_00_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_25_04_world_2017_11_06_00_world.sql
diff --git a/sql/updates/world/master/2021_01_25_05_world_2017_11_06_01_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_25_05_world_2017_11_06_01_world.sql
index d8b48885c22..d8b48885c22 100644
--- a/sql/updates/world/master/2021_01_25_05_world_2017_11_06_01_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_25_05_world_2017_11_06_01_world.sql
diff --git a/sql/updates/world/master/2021_01_25_06_world_2017_11_06_02_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_25_06_world_2017_11_06_02_world.sql
index 713afdd7d51..713afdd7d51 100644
--- a/sql/updates/world/master/2021_01_25_06_world_2017_11_06_02_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_25_06_world_2017_11_06_02_world.sql
diff --git a/sql/updates/world/master/2021_01_25_07_world_2017_11_07_00_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_25_07_world_2017_11_07_00_world.sql
index ff420db36fc..ff420db36fc 100644
--- a/sql/updates/world/master/2021_01_25_07_world_2017_11_07_00_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_25_07_world_2017_11_07_00_world.sql
diff --git a/sql/updates/world/master/2021_01_25_08_world_2017_11_08_00_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_25_08_world_2017_11_08_00_world.sql
index 2298430b29c..2298430b29c 100644
--- a/sql/updates/world/master/2021_01_25_08_world_2017_11_08_00_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_25_08_world_2017_11_08_00_world.sql
diff --git a/sql/updates/world/master/2021_01_25_09_world_2017_11_08_01_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_25_09_world_2017_11_08_01_world.sql
index 25ca05c1d1e..25ca05c1d1e 100644
--- a/sql/updates/world/master/2021_01_25_09_world_2017_11_08_01_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_25_09_world_2017_11_08_01_world.sql
diff --git a/sql/updates/world/master/2021_01_25_10_world_2017_11_08_03_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_25_10_world_2017_11_08_03_world.sql
index 971647121e9..971647121e9 100644
--- a/sql/updates/world/master/2021_01_25_10_world_2017_11_08_03_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_25_10_world_2017_11_08_03_world.sql
diff --git a/sql/updates/world/master/2021_01_25_11_world_2017_11_08_04_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_25_11_world_2017_11_08_04_world.sql
index a22522c9bb3..a22522c9bb3 100644
--- a/sql/updates/world/master/2021_01_25_11_world_2017_11_08_04_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_25_11_world_2017_11_08_04_world.sql
diff --git a/sql/updates/world/master/2021_01_25_12_world_2017_11_08_05_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_25_12_world_2017_11_08_05_world.sql
index e76ad05c39d..e76ad05c39d 100644
--- a/sql/updates/world/master/2021_01_25_12_world_2017_11_08_05_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_25_12_world_2017_11_08_05_world.sql
diff --git a/sql/updates/world/master/2021_01_25_13_world_2017_11_08_06_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_25_13_world_2017_11_08_06_world.sql
index 57f145f1f4c..57f145f1f4c 100644
--- a/sql/updates/world/master/2021_01_25_13_world_2017_11_08_06_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_25_13_world_2017_11_08_06_world.sql
diff --git a/sql/updates/world/master/2021_01_25_14_world_2017_11_08_07_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_25_14_world_2017_11_08_07_world.sql
index 03cdd475ada..03cdd475ada 100644
--- a/sql/updates/world/master/2021_01_25_14_world_2017_11_08_07_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_25_14_world_2017_11_08_07_world.sql
diff --git a/sql/updates/world/master/2021_01_25_15_world_2017_11_08_09_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_25_15_world_2017_11_08_09_world.sql
index a6486603aad..a6486603aad 100644
--- a/sql/updates/world/master/2021_01_25_15_world_2017_11_08_09_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_25_15_world_2017_11_08_09_world.sql
diff --git a/sql/updates/world/master/2021_01_25_16_world_2017_11_08_10_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_25_16_world_2017_11_08_10_world.sql
index b771d1d7127..b771d1d7127 100644
--- a/sql/updates/world/master/2021_01_25_16_world_2017_11_08_10_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_25_16_world_2017_11_08_10_world.sql
diff --git a/sql/updates/world/master/2021_01_25_17_world_2017_11_08_11_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_25_17_world_2017_11_08_11_world.sql
index 06c83cd4da5..06c83cd4da5 100644
--- a/sql/updates/world/master/2021_01_25_17_world_2017_11_08_11_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_25_17_world_2017_11_08_11_world.sql
diff --git a/sql/updates/world/master/2021_01_25_18_world_2017_11_08_12_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_25_18_world_2017_11_08_12_world.sql
index 2e817d66d24..2e817d66d24 100644
--- a/sql/updates/world/master/2021_01_25_18_world_2017_11_08_12_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_25_18_world_2017_11_08_12_world.sql
diff --git a/sql/updates/world/master/2021_01_25_19_world_2017_11_08_13_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_25_19_world_2017_11_08_13_world.sql
index ef892cad5e1..ef892cad5e1 100644
--- a/sql/updates/world/master/2021_01_25_19_world_2017_11_08_13_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_25_19_world_2017_11_08_13_world.sql
diff --git a/sql/updates/world/master/2021_01_25_20_world_2017_11_08_14_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_25_20_world_2017_11_08_14_world.sql
index 8ea6f717f34..8ea6f717f34 100644
--- a/sql/updates/world/master/2021_01_25_20_world_2017_11_08_14_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_25_20_world_2017_11_08_14_world.sql
diff --git a/sql/updates/world/master/2021_01_25_21_world_2017_11_08_15_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_25_21_world_2017_11_08_15_world.sql
index 9e0bdc2562f..9e0bdc2562f 100644
--- a/sql/updates/world/master/2021_01_25_21_world_2017_11_08_15_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_25_21_world_2017_11_08_15_world.sql
diff --git a/sql/updates/world/master/2021_01_25_22_world_2017_11_08_18_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_25_22_world_2017_11_08_18_world.sql
index 7cadac05e52..7cadac05e52 100644
--- a/sql/updates/world/master/2021_01_25_22_world_2017_11_08_18_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_25_22_world_2017_11_08_18_world.sql
diff --git a/sql/updates/world/master/2021_01_25_23_world_2017_11_08_19_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_25_23_world_2017_11_08_19_world.sql
index 665185c1796..665185c1796 100644
--- a/sql/updates/world/master/2021_01_25_23_world_2017_11_08_19_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_25_23_world_2017_11_08_19_world.sql
diff --git a/sql/updates/world/master/2021_01_25_24_world_2017_11_08_21_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_25_24_world_2017_11_08_21_world.sql
index ef481ed4644..ef481ed4644 100644
--- a/sql/updates/world/master/2021_01_25_24_world_2017_11_08_21_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_25_24_world_2017_11_08_21_world.sql
diff --git a/sql/updates/world/master/2021_01_25_25_world_2017_11_08_23_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_25_25_world_2017_11_08_23_world.sql
index 415f6d751c5..415f6d751c5 100644
--- a/sql/updates/world/master/2021_01_25_25_world_2017_11_08_23_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_25_25_world_2017_11_08_23_world.sql
diff --git a/sql/updates/world/master/2021_01_25_26_world_2017_11_08_24_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_25_26_world_2017_11_08_24_world.sql
index efe648f7f71..efe648f7f71 100644
--- a/sql/updates/world/master/2021_01_25_26_world_2017_11_08_24_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_25_26_world_2017_11_08_24_world.sql
diff --git a/sql/updates/world/master/2021_01_25_27_world_2017_11_08_08_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_25_27_world_2017_11_08_08_world.sql
index f1f4de20dd7..f1f4de20dd7 100644
--- a/sql/updates/world/master/2021_01_25_27_world_2017_11_08_08_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_25_27_world_2017_11_08_08_world.sql
diff --git a/sql/updates/world/master/2021_01_26_00_world_2017_11_08_25_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_26_00_world_2017_11_08_25_world.sql
index d609696d59c..d609696d59c 100644
--- a/sql/updates/world/master/2021_01_26_00_world_2017_11_08_25_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_26_00_world_2017_11_08_25_world.sql
diff --git a/sql/updates/world/master/2021_01_26_01_world_2017_11_08_27_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_26_01_world_2017_11_08_27_world.sql
index 42fbd075436..42fbd075436 100644
--- a/sql/updates/world/master/2021_01_26_01_world_2017_11_08_27_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_26_01_world_2017_11_08_27_world.sql
diff --git a/sql/updates/world/master/2021_01_26_02_world_2017_11_08_28_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_26_02_world_2017_11_08_28_world.sql
index b0243b3758f..b0243b3758f 100644
--- a/sql/updates/world/master/2021_01_26_02_world_2017_11_08_28_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_26_02_world_2017_11_08_28_world.sql
diff --git a/sql/updates/world/master/2021_01_30_00_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_30_00_world.sql
index 666b17f6828..666b17f6828 100644
--- a/sql/updates/world/master/2021_01_30_00_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_30_00_world.sql
diff --git a/sql/updates/world/master/2021_01_30_01_world_serverside_areatriggers.sql b/sql/old/9.x/world/20101_2021_07_04/2021_01_30_01_world_serverside_areatriggers.sql
index 22abd625043..22abd625043 100644
--- a/sql/updates/world/master/2021_01_30_01_world_serverside_areatriggers.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_01_30_01_world_serverside_areatriggers.sql
diff --git a/sql/updates/world/master/2021_02_01_00_world_2017_11_09_00_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_02_01_00_world_2017_11_09_00_world.sql
index a84c87efed4..a84c87efed4 100644
--- a/sql/updates/world/master/2021_02_01_00_world_2017_11_09_00_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_02_01_00_world_2017_11_09_00_world.sql
diff --git a/sql/updates/world/master/2021_02_01_01_world_2017_11_09_01_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_02_01_01_world_2017_11_09_01_world.sql
index 309badfce41..309badfce41 100644
--- a/sql/updates/world/master/2021_02_01_01_world_2017_11_09_01_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_02_01_01_world_2017_11_09_01_world.sql
diff --git a/sql/updates/world/master/2021_02_01_02_world_2017_11_14_01_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_02_01_02_world_2017_11_14_01_world.sql
index 3bc0da4ee1c..3bc0da4ee1c 100644
--- a/sql/updates/world/master/2021_02_01_02_world_2017_11_14_01_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_02_01_02_world_2017_11_14_01_world.sql
diff --git a/sql/updates/world/master/2021_02_03_00_world_2017_11_14_18_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_02_03_00_world_2017_11_14_18_world.sql
index 3321826898a..3321826898a 100644
--- a/sql/updates/world/master/2021_02_03_00_world_2017_11_14_18_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_02_03_00_world_2017_11_14_18_world.sql
diff --git a/sql/updates/world/master/2021_02_03_01_world_2017_11_16_00_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_02_03_01_world_2017_11_16_00_world.sql
index b8238149400..b8238149400 100644
--- a/sql/updates/world/master/2021_02_03_01_world_2017_11_16_00_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_02_03_01_world_2017_11_16_00_world.sql
diff --git a/sql/updates/world/master/2021_02_03_02_world_2017_11_16_02_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_02_03_02_world_2017_11_16_02_world.sql
index a72655a466b..a72655a466b 100644
--- a/sql/updates/world/master/2021_02_03_02_world_2017_11_16_02_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_02_03_02_world_2017_11_16_02_world.sql
diff --git a/sql/updates/world/master/2021_02_03_03_world_2017_11_16_03_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_02_03_03_world_2017_11_16_03_world.sql
index 7dc084911cc..7dc084911cc 100644
--- a/sql/updates/world/master/2021_02_03_03_world_2017_11_16_03_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_02_03_03_world_2017_11_16_03_world.sql
diff --git a/sql/updates/world/master/2021_02_03_04_world_2017_11_16_04_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_02_03_04_world_2017_11_16_04_world.sql
index 7effb159276..7effb159276 100644
--- a/sql/updates/world/master/2021_02_03_04_world_2017_11_16_04_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_02_03_04_world_2017_11_16_04_world.sql
diff --git a/sql/updates/world/master/2021_02_05_00_world_remove_pet_carrion.sql b/sql/old/9.x/world/20101_2021_07_04/2021_02_05_00_world_remove_pet_carrion.sql
index 347ae0ef1ca..347ae0ef1ca 100644
--- a/sql/updates/world/master/2021_02_05_00_world_remove_pet_carrion.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_02_05_00_world_remove_pet_carrion.sql
diff --git a/sql/updates/world/master/2021_02_06_00_world_2017_11_16_05_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_02_06_00_world_2017_11_16_05_world.sql
index 7d301ecf1bb..7d301ecf1bb 100644
--- a/sql/updates/world/master/2021_02_06_00_world_2017_11_16_05_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_02_06_00_world_2017_11_16_05_world.sql
diff --git a/sql/updates/world/master/2021_02_06_00_world_disable_artisan_riding.sql b/sql/old/9.x/world/20101_2021_07_04/2021_02_06_00_world_disable_artisan_riding.sql
index f4d46fd0431..f4d46fd0431 100644
--- a/sql/updates/world/master/2021_02_06_00_world_disable_artisan_riding.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_02_06_00_world_disable_artisan_riding.sql
diff --git a/sql/updates/world/master/2021_02_06_01_world_2017_11_16_06_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_02_06_01_world_2017_11_16_06_world.sql
index 9a6807a6f3d..9a6807a6f3d 100644
--- a/sql/updates/world/master/2021_02_06_01_world_2017_11_16_06_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_02_06_01_world_2017_11_16_06_world.sql
diff --git a/sql/updates/world/master/2021_02_06_02_world_2017_11_16_07_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_02_06_02_world_2017_11_16_07_world.sql
index 6ba4c00b720..6ba4c00b720 100644
--- a/sql/updates/world/master/2021_02_06_02_world_2017_11_16_07_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_02_06_02_world_2017_11_16_07_world.sql
diff --git a/sql/updates/world/master/2021_02_06_03_world_2017_11_16_08_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_02_06_03_world_2017_11_16_08_world.sql
index 7c987d7f9bc..7c987d7f9bc 100644
--- a/sql/updates/world/master/2021_02_06_03_world_2017_11_16_08_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_02_06_03_world_2017_11_16_08_world.sql
diff --git a/sql/updates/world/master/2021_02_06_04_world_2017_11_16_09_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_02_06_04_world_2017_11_16_09_world.sql
index 6ddab6bbe24..6ddab6bbe24 100644
--- a/sql/updates/world/master/2021_02_06_04_world_2017_11_16_09_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_02_06_04_world_2017_11_16_09_world.sql
diff --git a/sql/updates/world/master/2021_02_06_05_world_2017_11_16_10_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_02_06_05_world_2017_11_16_10_world.sql
index 294697d4d6c..294697d4d6c 100644
--- a/sql/updates/world/master/2021_02_06_05_world_2017_11_16_10_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_02_06_05_world_2017_11_16_10_world.sql
diff --git a/sql/updates/world/master/2021_02_07_00_world_2017_11_17_09_world_335.sql b/sql/old/9.x/world/20101_2021_07_04/2021_02_07_00_world_2017_11_17_09_world_335.sql
index b90fdea32a6..b90fdea32a6 100644
--- a/sql/updates/world/master/2021_02_07_00_world_2017_11_17_09_world_335.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_02_07_00_world_2017_11_17_09_world_335.sql
diff --git a/sql/updates/world/master/2021_02_07_01_world_2017_11_17_11_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_02_07_01_world_2017_11_17_11_world.sql
index bf7d8c3890d..bf7d8c3890d 100644
--- a/sql/updates/world/master/2021_02_07_01_world_2017_11_17_11_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_02_07_01_world_2017_11_17_11_world.sql
diff --git a/sql/updates/world/master/2021_02_07_02_world_2017_11_17_12_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_02_07_02_world_2017_11_17_12_world.sql
index 7897b75def4..7897b75def4 100644
--- a/sql/updates/world/master/2021_02_07_02_world_2017_11_17_12_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_02_07_02_world_2017_11_17_12_world.sql
diff --git a/sql/updates/world/master/2021_02_07_03_world_2017_11_17_13_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_02_07_03_world_2017_11_17_13_world.sql
index e4ce5d9e44d..e4ce5d9e44d 100644
--- a/sql/updates/world/master/2021_02_07_03_world_2017_11_17_13_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_02_07_03_world_2017_11_17_13_world.sql
diff --git a/sql/updates/world/master/2021_02_07_04_world_2017_11_20_00_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_02_07_04_world_2017_11_20_00_world.sql
index 222d4eff314..222d4eff314 100644
--- a/sql/updates/world/master/2021_02_07_04_world_2017_11_20_00_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_02_07_04_world_2017_11_20_00_world.sql
diff --git a/sql/updates/world/master/2021_02_07_05_world_2017_11_20_01_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_02_07_05_world_2017_11_20_01_world.sql
index 191ea45f919..191ea45f919 100644
--- a/sql/updates/world/master/2021_02_07_05_world_2017_11_20_01_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_02_07_05_world_2017_11_20_01_world.sql
diff --git a/sql/updates/world/master/2021_02_08_00_world_2017_11_21_07_world_335.sql b/sql/old/9.x/world/20101_2021_07_04/2021_02_08_00_world_2017_11_21_07_world_335.sql
index 8c36e896499..8c36e896499 100644
--- a/sql/updates/world/master/2021_02_08_00_world_2017_11_21_07_world_335.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_02_08_00_world_2017_11_21_07_world_335.sql
diff --git a/sql/updates/world/master/2021_02_08_01_world_2017_11_21_09_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_02_08_01_world_2017_11_21_09_world.sql
index f8092832bf1..f8092832bf1 100644
--- a/sql/updates/world/master/2021_02_08_01_world_2017_11_21_09_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_02_08_01_world_2017_11_21_09_world.sql
diff --git a/sql/updates/world/master/2021_02_08_02_world_2017_11_22_00_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_02_08_02_world_2017_11_22_00_world.sql
index 56a5e6401c1..56a5e6401c1 100644
--- a/sql/updates/world/master/2021_02_08_02_world_2017_11_22_00_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_02_08_02_world_2017_11_22_00_world.sql
diff --git a/sql/updates/world/master/2021_02_08_03_world_2017_11_22_01_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_02_08_03_world_2017_11_22_01_world.sql
index 288b3ad425b..288b3ad425b 100644
--- a/sql/updates/world/master/2021_02_08_03_world_2017_11_22_01_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_02_08_03_world_2017_11_22_01_world.sql
diff --git a/sql/updates/world/master/2021_02_08_04_world_2017_11_22_02_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_02_08_04_world_2017_11_22_02_world.sql
index eee98bc53fb..eee98bc53fb 100644
--- a/sql/updates/world/master/2021_02_08_04_world_2017_11_22_02_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_02_08_04_world_2017_11_22_02_world.sql
diff --git a/sql/updates/world/master/2021_02_08_05_world_2017_11_22_03_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_02_08_05_world_2017_11_22_03_world.sql
index 12d213ae2f7..12d213ae2f7 100644
--- a/sql/updates/world/master/2021_02_08_05_world_2017_11_22_03_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_02_08_05_world_2017_11_22_03_world.sql
diff --git a/sql/updates/world/master/2021_02_08_06_world_2017_11_22_04_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_02_08_06_world_2017_11_22_04_world.sql
index dd3879e5964..dd3879e5964 100644
--- a/sql/updates/world/master/2021_02_08_06_world_2017_11_22_04_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_02_08_06_world_2017_11_22_04_world.sql
diff --git a/sql/updates/world/master/2021_02_08_07_world_2017_11_24_00_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_02_08_07_world_2017_11_24_00_world.sql
index 92e682bbc9f..92e682bbc9f 100644
--- a/sql/updates/world/master/2021_02_08_07_world_2017_11_24_00_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_02_08_07_world_2017_11_24_00_world.sql
diff --git a/sql/updates/world/master/2021_02_08_08_world_2017_11_25_00_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_02_08_08_world_2017_11_25_00_world.sql
index d91529b1e4e..d91529b1e4e 100644
--- a/sql/updates/world/master/2021_02_08_08_world_2017_11_25_00_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_02_08_08_world_2017_11_25_00_world.sql
diff --git a/sql/updates/world/master/2021_02_13_00_world_mage_spell_touch_of_the_magi.sql b/sql/old/9.x/world/20101_2021_07_04/2021_02_13_00_world_mage_spell_touch_of_the_magi.sql
index 3b0b3fada9a..3b0b3fada9a 100644
--- a/sql/updates/world/master/2021_02_13_00_world_mage_spell_touch_of_the_magi.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_02_13_00_world_mage_spell_touch_of_the_magi.sql
diff --git a/sql/updates/world/master/2021_02_15_00_world_2017_11_26_00_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_02_15_00_world_2017_11_26_00_world.sql
index d3c9f7b192d..d3c9f7b192d 100644
--- a/sql/updates/world/master/2021_02_15_00_world_2017_11_26_00_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_02_15_00_world_2017_11_26_00_world.sql
diff --git a/sql/updates/world/master/2021_02_15_00_world_druid_prowl.sql b/sql/old/9.x/world/20101_2021_07_04/2021_02_15_00_world_druid_prowl.sql
index 0e82783e7d3..0e82783e7d3 100644
--- a/sql/updates/world/master/2021_02_15_00_world_druid_prowl.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_02_15_00_world_druid_prowl.sql
diff --git a/sql/updates/world/master/2021_02_15_01_world_2017_11_28_00_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_02_15_01_world_2017_11_28_00_world.sql
index aeeb516d5d8..aeeb516d5d8 100644
--- a/sql/updates/world/master/2021_02_15_01_world_2017_11_28_00_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_02_15_01_world_2017_11_28_00_world.sql
diff --git a/sql/updates/world/master/2021_02_15_02_world_2017_11_28_03_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_02_15_02_world_2017_11_28_03_world.sql
index 7dbfe96e263..7dbfe96e263 100644
--- a/sql/updates/world/master/2021_02_15_02_world_2017_11_28_03_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_02_15_02_world_2017_11_28_03_world.sql
diff --git a/sql/updates/world/master/2021_02_17_00_world_druid_gore.sql b/sql/old/9.x/world/20101_2021_07_04/2021_02_17_00_world_druid_gore.sql
index e439455dcd9..e439455dcd9 100644
--- a/sql/updates/world/master/2021_02_17_00_world_druid_gore.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_02_17_00_world_druid_gore.sql
diff --git a/sql/updates/world/master/2021_02_18_00_world_2017_11_28_11_world_335.sql b/sql/old/9.x/world/20101_2021_07_04/2021_02_18_00_world_2017_11_28_11_world_335.sql
index d9076d68932..d9076d68932 100644
--- a/sql/updates/world/master/2021_02_18_00_world_2017_11_28_11_world_335.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_02_18_00_world_2017_11_28_11_world_335.sql
diff --git a/sql/updates/world/master/2021_02_18_00_world_fingers_of_frost_proc_attributes.sql b/sql/old/9.x/world/20101_2021_07_04/2021_02_18_00_world_fingers_of_frost_proc_attributes.sql
index 037e3eb2413..037e3eb2413 100644
--- a/sql/updates/world/master/2021_02_18_00_world_fingers_of_frost_proc_attributes.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_02_18_00_world_fingers_of_frost_proc_attributes.sql
diff --git a/sql/updates/world/master/2021_02_18_01_world_2017_11_28_12_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_02_18_01_world_2017_11_28_12_world.sql
index 0c667dfc5bd..0c667dfc5bd 100644
--- a/sql/updates/world/master/2021_02_18_01_world_2017_11_28_12_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_02_18_01_world_2017_11_28_12_world.sql
diff --git a/sql/updates/world/master/2021_02_18_02_world_2017_11_29_00_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_02_18_02_world_2017_11_29_00_world.sql
index b4bef22d966..b4bef22d966 100644
--- a/sql/updates/world/master/2021_02_18_02_world_2017_11_29_00_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_02_18_02_world_2017_11_29_00_world.sql
diff --git a/sql/updates/world/master/2021_02_18_03_world_2017_11_30_00_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_02_18_03_world_2017_11_30_00_world.sql
index bce851e9581..bce851e9581 100644
--- a/sql/updates/world/master/2021_02_18_03_world_2017_11_30_00_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_02_18_03_world_2017_11_30_00_world.sql
diff --git a/sql/updates/world/master/2021_02_18_04_world_2017_11_30_01_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_02_18_04_world_2017_11_30_01_world.sql
index bc418f88ea7..bc418f88ea7 100644
--- a/sql/updates/world/master/2021_02_18_04_world_2017_11_30_01_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_02_18_04_world_2017_11_30_01_world.sql
diff --git a/sql/updates/world/master/2021_02_18_05_world_2017_12_04_01_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_02_18_05_world_2017_12_04_01_world.sql
index 9e6ba6240b0..9e6ba6240b0 100644
--- a/sql/updates/world/master/2021_02_18_05_world_2017_12_04_01_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_02_18_05_world_2017_12_04_01_world.sql
diff --git a/sql/updates/world/master/2021_02_18_06_world_2017_12_04_04_world_335.sql b/sql/old/9.x/world/20101_2021_07_04/2021_02_18_06_world_2017_12_04_04_world_335.sql
index 939fe265bda..939fe265bda 100644
--- a/sql/updates/world/master/2021_02_18_06_world_2017_12_04_04_world_335.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_02_18_06_world_2017_12_04_04_world_335.sql
diff --git a/sql/updates/world/master/2021_02_18_07_world_2017_12_05_01_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_02_18_07_world_2017_12_05_01_world.sql
index e990dd8e848..e990dd8e848 100644
--- a/sql/updates/world/master/2021_02_18_07_world_2017_12_05_01_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_02_18_07_world_2017_12_05_01_world.sql
diff --git a/sql/updates/world/master/2021_02_18_08_world_2017_12_05_00_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_02_18_08_world_2017_12_05_00_world.sql
index 3707ef18f3c..3707ef18f3c 100644
--- a/sql/updates/world/master/2021_02_18_08_world_2017_12_05_00_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_02_18_08_world_2017_12_05_00_world.sql
diff --git a/sql/updates/world/master/2021_02_18_09_world_2017_12_05_02_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_02_18_09_world_2017_12_05_02_world.sql
index 0a278bd33eb..0a278bd33eb 100644
--- a/sql/updates/world/master/2021_02_18_09_world_2017_12_05_02_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_02_18_09_world_2017_12_05_02_world.sql
diff --git a/sql/updates/world/master/2021_02_18_10_world_2017_12_09_00_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_02_18_10_world_2017_12_09_00_world.sql
index aae5b838b3c..aae5b838b3c 100644
--- a/sql/updates/world/master/2021_02_18_10_world_2017_12_09_00_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_02_18_10_world_2017_12_09_00_world.sql
diff --git a/sql/updates/world/master/2021_02_21_00_world_priest_prayer_of_mending.sql b/sql/old/9.x/world/20101_2021_07_04/2021_02_21_00_world_priest_prayer_of_mending.sql
index 21fe90c99b5..21fe90c99b5 100644
--- a/sql/updates/world/master/2021_02_21_00_world_priest_prayer_of_mending.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_02_21_00_world_priest_prayer_of_mending.sql
diff --git a/sql/updates/world/master/2021_02_22_00_world_druid_skull_bash.sql b/sql/old/9.x/world/20101_2021_07_04/2021_02_22_00_world_druid_skull_bash.sql
index 7b6ef84c35d..7b6ef84c35d 100644
--- a/sql/updates/world/master/2021_02_22_00_world_druid_skull_bash.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_02_22_00_world_druid_skull_bash.sql
diff --git a/sql/updates/world/master/2021_02_23_00_world_druid_ferocious_bite.sql b/sql/old/9.x/world/20101_2021_07_04/2021_02_23_00_world_druid_ferocious_bite.sql
index 12513e5b1eb..12513e5b1eb 100644
--- a/sql/updates/world/master/2021_02_23_00_world_druid_ferocious_bite.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_02_23_00_world_druid_ferocious_bite.sql
diff --git a/sql/updates/world/master/2021_02_24_00_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_02_24_00_world.sql
index 69a365ce2b9..69a365ce2b9 100644
--- a/sql/updates/world/master/2021_02_24_00_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_02_24_00_world.sql
diff --git a/sql/updates/world/master/2021_02_24_01_world_paladin_spells_remove_unused.sql b/sql/old/9.x/world/20101_2021_07_04/2021_02_24_01_world_paladin_spells_remove_unused.sql
index 4de14d7ba2f..4de14d7ba2f 100644
--- a/sql/updates/world/master/2021_02_24_01_world_paladin_spells_remove_unused.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_02_24_01_world_paladin_spells_remove_unused.sql
diff --git a/sql/updates/world/master/2021_02_24_02_world_delete_outdate_starting_spells.sql b/sql/old/9.x/world/20101_2021_07_04/2021_02_24_02_world_delete_outdate_starting_spells.sql
index 6e590b831b8..6e590b831b8 100644
--- a/sql/updates/world/master/2021_02_24_02_world_delete_outdate_starting_spells.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_02_24_02_world_delete_outdate_starting_spells.sql
diff --git a/sql/updates/world/master/2021_02_27_00_world_priest_spells_remove_unused.sql b/sql/old/9.x/world/20101_2021_07_04/2021_02_27_00_world_priest_spells_remove_unused.sql
index 823ee1ca476..823ee1ca476 100644
--- a/sql/updates/world/master/2021_02_27_00_world_priest_spells_remove_unused.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_02_27_00_world_priest_spells_remove_unused.sql
diff --git a/sql/updates/world/master/2021_02_27_01_world_hunter_spells_remove_unused.sql b/sql/old/9.x/world/20101_2021_07_04/2021_02_27_01_world_hunter_spells_remove_unused.sql
index 6c4531c7f1c..6c4531c7f1c 100644
--- a/sql/updates/world/master/2021_02_27_01_world_hunter_spells_remove_unused.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_02_27_01_world_hunter_spells_remove_unused.sql
diff --git a/sql/updates/world/master/2021_02_27_02_world_rogue_spells_remove_unused.sql b/sql/old/9.x/world/20101_2021_07_04/2021_02_27_02_world_rogue_spells_remove_unused.sql
index c1c921c96dd..c1c921c96dd 100644
--- a/sql/updates/world/master/2021_02_27_02_world_rogue_spells_remove_unused.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_02_27_02_world_rogue_spells_remove_unused.sql
diff --git a/sql/updates/world/master/2021_02_27_03_world_shaman_spells_remove_unused.sql b/sql/old/9.x/world/20101_2021_07_04/2021_02_27_03_world_shaman_spells_remove_unused.sql
index 66187377083..66187377083 100644
--- a/sql/updates/world/master/2021_02_27_03_world_shaman_spells_remove_unused.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_02_27_03_world_shaman_spells_remove_unused.sql
diff --git a/sql/updates/world/master/2021_02_27_04_world_warlock_spells_remove_unused.sql b/sql/old/9.x/world/20101_2021_07_04/2021_02_27_04_world_warlock_spells_remove_unused.sql
index f0520f15414..f0520f15414 100644
--- a/sql/updates/world/master/2021_02_27_04_world_warlock_spells_remove_unused.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_02_27_04_world_warlock_spells_remove_unused.sql
diff --git a/sql/updates/world/master/2021_02_27_05_world_dk_spells_remove_unused.sql b/sql/old/9.x/world/20101_2021_07_04/2021_02_27_05_world_dk_spells_remove_unused.sql
index 4b427f8a7b8..4b427f8a7b8 100644
--- a/sql/updates/world/master/2021_02_27_05_world_dk_spells_remove_unused.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_02_27_05_world_dk_spells_remove_unused.sql
diff --git a/sql/updates/world/master/2021_02_27_06_world_warrior_spells_remove_unused.sql b/sql/old/9.x/world/20101_2021_07_04/2021_02_27_06_world_warrior_spells_remove_unused.sql
index 4b8ddff11a8..4b8ddff11a8 100644
--- a/sql/updates/world/master/2021_02_27_06_world_warrior_spells_remove_unused.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_02_27_06_world_warrior_spells_remove_unused.sql
diff --git a/sql/updates/world/master/2021_02_27_07_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_02_27_07_world.sql
index 64699db193a..64699db193a 100644
--- a/sql/updates/world/master/2021_02_27_07_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_02_27_07_world.sql
diff --git a/sql/updates/world/master/2021_03_02_00_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_03_02_00_world.sql
index 9f0c1991a6d..9f0c1991a6d 100644
--- a/sql/updates/world/master/2021_03_02_00_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_03_02_00_world.sql
diff --git a/sql/updates/world/master/2021_03_02_01_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_03_02_01_world.sql
index f99482fc24f..f99482fc24f 100644
--- a/sql/updates/world/master/2021_03_02_01_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_03_02_01_world.sql
diff --git a/sql/updates/world/master/2021_03_02_02_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_03_02_02_world.sql
index 47da428bc92..47da428bc92 100644
--- a/sql/updates/world/master/2021_03_02_02_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_03_02_02_world.sql
diff --git a/sql/updates/world/master/2021_03_04_00_world_paladin_spells.sql b/sql/old/9.x/world/20101_2021_07_04/2021_03_04_00_world_paladin_spells.sql
index fb90c1e6e3e..fb90c1e6e3e 100644
--- a/sql/updates/world/master/2021_03_04_00_world_paladin_spells.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_03_04_00_world_paladin_spells.sql
diff --git a/sql/updates/world/master/2021_03_06_00_world_nonsavable_auras.sql b/sql/old/9.x/world/20101_2021_07_04/2021_03_06_00_world_nonsavable_auras.sql
index bce2f53a71a..bce2f53a71a 100644
--- a/sql/updates/world/master/2021_03_06_00_world_nonsavable_auras.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_03_06_00_world_nonsavable_auras.sql
diff --git a/sql/updates/world/master/2021_03_07_00_world_2017_12_14_01_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_03_07_00_world_2017_12_14_01_world.sql
index 1faf5fc48cd..1faf5fc48cd 100644
--- a/sql/updates/world/master/2021_03_07_00_world_2017_12_14_01_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_03_07_00_world_2017_12_14_01_world.sql
diff --git a/sql/updates/world/master/2021_03_07_01_world_2017_12_15_00_world_335.sql b/sql/old/9.x/world/20101_2021_07_04/2021_03_07_01_world_2017_12_15_00_world_335.sql
index b5358e2808f..b5358e2808f 100644
--- a/sql/updates/world/master/2021_03_07_01_world_2017_12_15_00_world_335.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_03_07_01_world_2017_12_15_00_world_335.sql
diff --git a/sql/updates/world/master/2021_03_07_02_world_2017_12_15_01_world_335.sql b/sql/old/9.x/world/20101_2021_07_04/2021_03_07_02_world_2017_12_15_01_world_335.sql
index b1296e55b2f..b1296e55b2f 100644
--- a/sql/updates/world/master/2021_03_07_02_world_2017_12_15_01_world_335.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_03_07_02_world_2017_12_15_01_world_335.sql
diff --git a/sql/updates/world/master/2021_03_07_03_world_2017_12_15_02_world_335.sql b/sql/old/9.x/world/20101_2021_07_04/2021_03_07_03_world_2017_12_15_02_world_335.sql
index 29e2e6edbfe..29e2e6edbfe 100644
--- a/sql/updates/world/master/2021_03_07_03_world_2017_12_15_02_world_335.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_03_07_03_world_2017_12_15_02_world_335.sql
diff --git a/sql/updates/world/master/2021_03_08_00_world_druid_guardian_spells.sql b/sql/old/9.x/world/20101_2021_07_04/2021_03_08_00_world_druid_guardian_spells.sql
index dc3d985675f..dc3d985675f 100644
--- a/sql/updates/world/master/2021_03_08_00_world_druid_guardian_spells.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_03_08_00_world_druid_guardian_spells.sql
diff --git a/sql/updates/world/master/2021_03_12_00_world_serverside_spells.sql b/sql/old/9.x/world/20101_2021_07_04/2021_03_12_00_world_serverside_spells.sql
index 0960f3a04fa..0960f3a04fa 100644
--- a/sql/updates/world/master/2021_03_12_00_world_serverside_spells.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_03_12_00_world_serverside_spells.sql
diff --git a/sql/updates/world/master/2021_03_12_01_world_serverside_spells_cleanup.sql b/sql/old/9.x/world/20101_2021_07_04/2021_03_12_01_world_serverside_spells_cleanup.sql
index dde59c1ee64..dde59c1ee64 100644
--- a/sql/updates/world/master/2021_03_12_01_world_serverside_spells_cleanup.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_03_12_01_world_serverside_spells_cleanup.sql
diff --git a/sql/updates/world/master/2021_03_13_00_world_mage_fingers_of_frost.sql b/sql/old/9.x/world/20101_2021_07_04/2021_03_13_00_world_mage_fingers_of_frost.sql
index 72857299ccc..72857299ccc 100644
--- a/sql/updates/world/master/2021_03_13_00_world_mage_fingers_of_frost.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_03_13_00_world_mage_fingers_of_frost.sql
diff --git a/sql/updates/world/master/2021_03_13_01_world_2017_12_15_03_world_335.sql b/sql/old/9.x/world/20101_2021_07_04/2021_03_13_01_world_2017_12_15_03_world_335.sql
index 9b3615f65fc..9b3615f65fc 100644
--- a/sql/updates/world/master/2021_03_13_01_world_2017_12_15_03_world_335.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_03_13_01_world_2017_12_15_03_world_335.sql
diff --git a/sql/updates/world/master/2021_03_14_00_world_2017_12_16_00_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_03_14_00_world_2017_12_16_00_world.sql
index 12ff8116a91..12ff8116a91 100644
--- a/sql/updates/world/master/2021_03_14_00_world_2017_12_16_00_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_03_14_00_world_2017_12_16_00_world.sql
diff --git a/sql/updates/world/master/2021_03_14_01_world_2017_12_16_01_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_03_14_01_world_2017_12_16_01_world.sql
index 22ce91a7fd2..22ce91a7fd2 100644
--- a/sql/updates/world/master/2021_03_14_01_world_2017_12_16_01_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_03_14_01_world_2017_12_16_01_world.sql
diff --git a/sql/updates/world/master/2021_03_14_02_world_2017_12_16_03_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_03_14_02_world_2017_12_16_03_world.sql
index 0037fd3549f..0037fd3549f 100644
--- a/sql/updates/world/master/2021_03_14_02_world_2017_12_16_03_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_03_14_02_world_2017_12_16_03_world.sql
diff --git a/sql/updates/world/master/2021_03_15_00_world_dk_blood_mastery.sql b/sql/old/9.x/world/20101_2021_07_04/2021_03_15_00_world_dk_blood_mastery.sql
index c93c620e754..c93c620e754 100644
--- a/sql/updates/world/master/2021_03_15_00_world_dk_blood_mastery.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_03_15_00_world_dk_blood_mastery.sql
diff --git a/sql/updates/world/master/2021_03_15_01_world_2017_12_17_00_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_03_15_01_world_2017_12_17_00_world.sql
index 999a4b25546..999a4b25546 100644
--- a/sql/updates/world/master/2021_03_15_01_world_2017_12_17_00_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_03_15_01_world_2017_12_17_00_world.sql
diff --git a/sql/updates/world/master/2021_03_15_02_world_2017_12_17_01_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_03_15_02_world_2017_12_17_01_world.sql
index 3ae0c2d95f4..3ae0c2d95f4 100644
--- a/sql/updates/world/master/2021_03_15_02_world_2017_12_17_01_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_03_15_02_world_2017_12_17_01_world.sql
diff --git a/sql/updates/world/master/2021_03_15_03_world_2017_12_18_00_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_03_15_03_world_2017_12_18_00_world.sql
index 27f2f8a0dc6..27f2f8a0dc6 100644
--- a/sql/updates/world/master/2021_03_15_03_world_2017_12_18_00_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_03_15_03_world_2017_12_18_00_world.sql
diff --git a/sql/updates/world/master/2021_03_16_00_world_2017_12_19_01_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_03_16_00_world_2017_12_19_01_world.sql
index 802a2dbbbcf..802a2dbbbcf 100644
--- a/sql/updates/world/master/2021_03_16_00_world_2017_12_19_01_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_03_16_00_world_2017_12_19_01_world.sql
diff --git a/sql/updates/world/master/2021_03_17_00_world_2017_12_20_00_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_03_17_00_world_2017_12_20_00_world.sql
index b12e6abd98d..b12e6abd98d 100644
--- a/sql/updates/world/master/2021_03_17_00_world_2017_12_20_00_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_03_17_00_world_2017_12_20_00_world.sql
diff --git a/sql/updates/world/master/2021_03_18_00_world_2017_12_20_04_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_03_18_00_world_2017_12_20_04_world.sql
index b099bed4337..b099bed4337 100644
--- a/sql/updates/world/master/2021_03_18_00_world_2017_12_20_04_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_03_18_00_world_2017_12_20_04_world.sql
diff --git a/sql/updates/world/master/2021_03_18_01_world_2017_12_20_05_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_03_18_01_world_2017_12_20_05_world.sql
index 96c3a51b727..96c3a51b727 100644
--- a/sql/updates/world/master/2021_03_18_01_world_2017_12_20_05_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_03_18_01_world_2017_12_20_05_world.sql
diff --git a/sql/updates/world/master/2021_03_18_02_world_2017_12_21_00_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_03_18_02_world_2017_12_21_00_world.sql
index f1763e34575..f1763e34575 100644
--- a/sql/updates/world/master/2021_03_18_02_world_2017_12_21_00_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_03_18_02_world_2017_12_21_00_world.sql
diff --git a/sql/updates/world/master/2021_03_18_03_world_2017_12_21_01_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_03_18_03_world_2017_12_21_01_world.sql
index d648463da68..d648463da68 100644
--- a/sql/updates/world/master/2021_03_18_03_world_2017_12_21_01_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_03_18_03_world_2017_12_21_01_world.sql
diff --git a/sql/updates/world/master/2021_03_18_04_world_2017_12_21_02_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_03_18_04_world_2017_12_21_02_world.sql
index b7fece8a3cb..b7fece8a3cb 100644
--- a/sql/updates/world/master/2021_03_18_04_world_2017_12_21_02_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_03_18_04_world_2017_12_21_02_world.sql
diff --git a/sql/updates/world/master/2021_03_18_05_world_2017_12_22_00_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_03_18_05_world_2017_12_22_00_world.sql
index 9f671922aeb..9f671922aeb 100644
--- a/sql/updates/world/master/2021_03_18_05_world_2017_12_22_00_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_03_18_05_world_2017_12_22_00_world.sql
diff --git a/sql/updates/world/master/2021_03_18_06_world_2017_12_23_01_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_03_18_06_world_2017_12_23_01_world.sql
index c61443d2404..c61443d2404 100644
--- a/sql/updates/world/master/2021_03_18_06_world_2017_12_23_01_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_03_18_06_world_2017_12_23_01_world.sql
diff --git a/sql/updates/world/master/2021_03_19_00_world_2017_12_24_00_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_03_19_00_world_2017_12_24_00_world.sql
index 90d099fb0a0..90d099fb0a0 100644
--- a/sql/updates/world/master/2021_03_19_00_world_2017_12_24_00_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_03_19_00_world_2017_12_24_00_world.sql
diff --git a/sql/updates/world/master/2021_03_19_01_world_2017_12_25_00_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_03_19_01_world_2017_12_25_00_world.sql
index ac78bfdc15d..ac78bfdc15d 100644
--- a/sql/updates/world/master/2021_03_19_01_world_2017_12_25_00_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_03_19_01_world_2017_12_25_00_world.sql
diff --git a/sql/updates/world/master/2021_03_19_02_world_2017_12_28_01_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_03_19_02_world_2017_12_28_01_world.sql
index 535bc7f5f16..535bc7f5f16 100644
--- a/sql/updates/world/master/2021_03_19_02_world_2017_12_28_01_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_03_19_02_world_2017_12_28_01_world.sql
diff --git a/sql/updates/world/master/2021_03_19_03_world_2017_12_28_02_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_03_19_03_world_2017_12_28_02_world.sql
index 8f580e7362b..8f580e7362b 100644
--- a/sql/updates/world/master/2021_03_19_03_world_2017_12_28_02_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_03_19_03_world_2017_12_28_02_world.sql
diff --git a/sql/updates/world/master/2021_03_19_04_world_2017_12_28_03_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_03_19_04_world_2017_12_28_03_world.sql
index c8012633a6e..c8012633a6e 100644
--- a/sql/updates/world/master/2021_03_19_04_world_2017_12_28_03_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_03_19_04_world_2017_12_28_03_world.sql
diff --git a/sql/updates/world/master/2021_03_19_05_world_2017_12_28_04_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_03_19_05_world_2017_12_28_04_world.sql
index d4f3c7ef827..d4f3c7ef827 100644
--- a/sql/updates/world/master/2021_03_19_05_world_2017_12_28_04_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_03_19_05_world_2017_12_28_04_world.sql
diff --git a/sql/updates/world/master/2021_03_19_06_world_2017_12_28_05_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_03_19_06_world_2017_12_28_05_world.sql
index a1d31371e46..a1d31371e46 100644
--- a/sql/updates/world/master/2021_03_19_06_world_2017_12_28_05_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_03_19_06_world_2017_12_28_05_world.sql
diff --git a/sql/updates/world/master/2021_03_19_07_world_2017_12_29_00_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_03_19_07_world_2017_12_29_00_world.sql
index b6c0dd3bcb6..b6c0dd3bcb6 100644
--- a/sql/updates/world/master/2021_03_19_07_world_2017_12_29_00_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_03_19_07_world_2017_12_29_00_world.sql
diff --git a/sql/updates/world/master/2021_03_20_00_world_2017_12_30_00_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_03_20_00_world_2017_12_30_00_world.sql
index 83465eb3934..83465eb3934 100644
--- a/sql/updates/world/master/2021_03_20_00_world_2017_12_30_00_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_03_20_00_world_2017_12_30_00_world.sql
diff --git a/sql/updates/world/master/2021_03_23_00_world_druid_eclipse.sql b/sql/old/9.x/world/20101_2021_07_04/2021_03_23_00_world_druid_eclipse.sql
index 01b1a47dd93..01b1a47dd93 100644
--- a/sql/updates/world/master/2021_03_23_00_world_druid_eclipse.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_03_23_00_world_druid_eclipse.sql
diff --git a/sql/updates/world/master/2021_03_29_00_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_03_29_00_world.sql
index 51b0bb67aa9..51b0bb67aa9 100644
--- a/sql/updates/world/master/2021_03_29_00_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_03_29_00_world.sql
diff --git a/sql/updates/world/master/2021_04_02_00_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_04_02_00_world.sql
index 7c9b4463e19..7c9b4463e19 100644
--- a/sql/updates/world/master/2021_04_02_00_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_04_02_00_world.sql
diff --git a/sql/updates/world/master/2021_04_05_00_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_04_05_00_world.sql
index b733db66a10..b733db66a10 100644
--- a/sql/updates/world/master/2021_04_05_00_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_04_05_00_world.sql
diff --git a/sql/updates/world/master/2021_04_09_00_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_04_09_00_world.sql
index 64696de1aef..64696de1aef 100644
--- a/sql/updates/world/master/2021_04_09_00_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_04_09_00_world.sql
diff --git a/sql/updates/world/master/2021_04_11_00_world_shaman_spells.sql b/sql/old/9.x/world/20101_2021_07_04/2021_04_11_00_world_shaman_spells.sql
index fdcf2fc855d..fdcf2fc855d 100644
--- a/sql/updates/world/master/2021_04_11_00_world_shaman_spells.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_04_11_00_world_shaman_spells.sql
diff --git a/sql/updates/world/master/2021_04_11_01_world_druid_spells.sql b/sql/old/9.x/world/20101_2021_07_04/2021_04_11_01_world_druid_spells.sql
index 4f6adbc8861..4f6adbc8861 100644
--- a/sql/updates/world/master/2021_04_11_01_world_druid_spells.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_04_11_01_world_druid_spells.sql
diff --git a/sql/updates/world/master/2021_04_12_00_world_draenei_racial_spell.sql b/sql/old/9.x/world/20101_2021_07_04/2021_04_12_00_world_draenei_racial_spell.sql
index 3cfefaebb3b..3cfefaebb3b 100644
--- a/sql/updates/world/master/2021_04_12_00_world_draenei_racial_spell.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_04_12_00_world_draenei_racial_spell.sql
diff --git a/sql/updates/world/master/2021_04_19_00_world_priest_holy_words.sql b/sql/old/9.x/world/20101_2021_07_04/2021_04_19_00_world_priest_holy_words.sql
index 073c084fcc2..073c084fcc2 100644
--- a/sql/updates/world/master/2021_04_19_00_world_priest_holy_words.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_04_19_00_world_priest_holy_words.sql
diff --git a/sql/updates/world/master/2021_04_21_00_world_priest_atonement.sql b/sql/old/9.x/world/20101_2021_07_04/2021_04_21_00_world_priest_atonement.sql
index 02e7f3f9ce0..02e7f3f9ce0 100644
--- a/sql/updates/world/master/2021_04_21_00_world_priest_atonement.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_04_21_00_world_priest_atonement.sql
diff --git a/sql/updates/world/master/2021_04_22_00_world_monk_stagger.sql b/sql/old/9.x/world/20101_2021_07_04/2021_04_22_00_world_monk_stagger.sql
index 327d6aeeed6..327d6aeeed6 100644
--- a/sql/updates/world/master/2021_04_22_00_world_monk_stagger.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_04_22_00_world_monk_stagger.sql
diff --git a/sql/updates/world/master/2021_04_24_00_world_2018_01_01_00_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_04_24_00_world_2018_01_01_00_world.sql
index 109071ba4db..109071ba4db 100644
--- a/sql/updates/world/master/2021_04_24_00_world_2018_01_01_00_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_04_24_00_world_2018_01_01_00_world.sql
diff --git a/sql/updates/world/master/2021_04_26_00_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_04_26_00_world.sql
index a796650e5f4..a796650e5f4 100644
--- a/sql/updates/world/master/2021_04_26_00_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_04_26_00_world.sql
diff --git a/sql/updates/world/master/2021_05_01_00_world_2018_01_01_01_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_05_01_00_world_2018_01_01_01_world.sql
index 32bd6c76e67..32bd6c76e67 100644
--- a/sql/updates/world/master/2021_05_01_00_world_2018_01_01_01_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_05_01_00_world_2018_01_01_01_world.sql
diff --git a/sql/updates/world/master/2021_05_01_01_world_2018_01_02_01_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_05_01_01_world_2018_01_02_01_world.sql
index 9ccc41e9061..9ccc41e9061 100644
--- a/sql/updates/world/master/2021_05_01_01_world_2018_01_02_01_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_05_01_01_world_2018_01_02_01_world.sql
diff --git a/sql/updates/world/master/2021_05_01_02_world_2018_01_02_02_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_05_01_02_world_2018_01_02_02_world.sql
index 7fe03e77a5d..7fe03e77a5d 100644
--- a/sql/updates/world/master/2021_05_01_02_world_2018_01_02_02_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_05_01_02_world_2018_01_02_02_world.sql
diff --git a/sql/updates/world/master/2021_05_01_03_world_2018_01_02_03_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_05_01_03_world_2018_01_02_03_world.sql
index 7110f22eaf0..7110f22eaf0 100644
--- a/sql/updates/world/master/2021_05_01_03_world_2018_01_02_03_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_05_01_03_world_2018_01_02_03_world.sql
diff --git a/sql/updates/world/master/2021_05_01_04_world_2018_01_02_04_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_05_01_04_world_2018_01_02_04_world.sql
index c1cd0292f19..c1cd0292f19 100644
--- a/sql/updates/world/master/2021_05_01_04_world_2018_01_02_04_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_05_01_04_world_2018_01_02_04_world.sql
diff --git a/sql/updates/world/master/2021_05_01_05_world_2018_01_02_05_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_05_01_05_world_2018_01_02_05_world.sql
index 7951adb7945..7951adb7945 100644
--- a/sql/updates/world/master/2021_05_01_05_world_2018_01_02_05_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_05_01_05_world_2018_01_02_05_world.sql
diff --git a/sql/updates/world/master/2021_05_01_06_world_2018_01_02_07_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_05_01_06_world_2018_01_02_07_world.sql
index 61e30a5dbe5..61e30a5dbe5 100644
--- a/sql/updates/world/master/2021_05_01_06_world_2018_01_02_07_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_05_01_06_world_2018_01_02_07_world.sql
diff --git a/sql/updates/world/master/2021_05_04_00_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_05_04_00_world.sql
index 9706b973678..9706b973678 100644
--- a/sql/updates/world/master/2021_05_04_00_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_05_04_00_world.sql
diff --git a/sql/updates/world/master/2021_05_04_01_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_05_04_01_world.sql
index 4722b029f7f..4722b029f7f 100644
--- a/sql/updates/world/master/2021_05_04_01_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_05_04_01_world.sql
diff --git a/sql/updates/world/master/2021_05_04_02_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_05_04_02_world.sql
index dba696d926f..dba696d926f 100644
--- a/sql/updates/world/master/2021_05_04_02_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_05_04_02_world.sql
diff --git a/sql/updates/world/master/2021_05_04_02_world_2018_01_02_08_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_05_04_02_world_2018_01_02_08_world.sql
index 2c1c824a91f..2c1c824a91f 100644
--- a/sql/updates/world/master/2021_05_04_02_world_2018_01_02_08_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_05_04_02_world_2018_01_02_08_world.sql
diff --git a/sql/updates/world/master/2021_05_04_03_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_05_04_03_world.sql
index 13085519267..13085519267 100644
--- a/sql/updates/world/master/2021_05_04_03_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_05_04_03_world.sql
diff --git a/sql/updates/world/master/2021_05_05_00_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_05_05_00_world.sql
index b16aaed2f9b..b16aaed2f9b 100644
--- a/sql/updates/world/master/2021_05_05_00_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_05_05_00_world.sql
diff --git a/sql/updates/world/master/2021_05_05_01_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_05_05_01_world.sql
index 7a62f93c829..7a62f93c829 100644
--- a/sql/updates/world/master/2021_05_05_01_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_05_05_01_world.sql
diff --git a/sql/updates/world/master/2021_05_06_00_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_05_06_00_world.sql
index c40c87349d2..c40c87349d2 100644
--- a/sql/updates/world/master/2021_05_06_00_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_05_06_00_world.sql
diff --git a/sql/updates/world/master/2021_05_06_01_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_05_06_01_world.sql
index 000156a07a4..000156a07a4 100644
--- a/sql/updates/world/master/2021_05_06_01_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_05_06_01_world.sql
diff --git a/sql/updates/world/master/2021_05_06_02_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_05_06_02_world.sql
index e058ef5d398..e058ef5d398 100644
--- a/sql/updates/world/master/2021_05_06_02_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_05_06_02_world.sql
diff --git a/sql/updates/world/master/2021_05_06_03_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_05_06_03_world.sql
index e058ef5d398..e058ef5d398 100644
--- a/sql/updates/world/master/2021_05_06_03_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_05_06_03_world.sql
diff --git a/sql/updates/world/master/2021_05_07_00_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_05_07_00_world.sql
index 75b39c358fc..75b39c358fc 100644
--- a/sql/updates/world/master/2021_05_07_00_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_05_07_00_world.sql
diff --git a/sql/updates/world/master/2021_05_07_01_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_05_07_01_world.sql
index b427ae9cbbd..b427ae9cbbd 100644
--- a/sql/updates/world/master/2021_05_07_01_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_05_07_01_world.sql
diff --git a/sql/updates/world/master/2021_05_07_02_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_05_07_02_world.sql
index 2266450a5d8..2266450a5d8 100644
--- a/sql/updates/world/master/2021_05_07_02_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_05_07_02_world.sql
diff --git a/sql/updates/world/master/2021_05_07_03_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_05_07_03_world.sql
index 0e8e03648b4..0e8e03648b4 100644
--- a/sql/updates/world/master/2021_05_07_03_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_05_07_03_world.sql
diff --git a/sql/updates/world/master/2021_05_07_04_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_05_07_04_world.sql
index 5872c20a998..5872c20a998 100644
--- a/sql/updates/world/master/2021_05_07_04_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_05_07_04_world.sql
diff --git a/sql/updates/world/master/2021_05_07_05_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_05_07_05_world.sql
index 06c19f16545..06c19f16545 100644
--- a/sql/updates/world/master/2021_05_07_05_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_05_07_05_world.sql
diff --git a/sql/updates/world/master/2021_05_09_00_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_05_09_00_world.sql
index 5945bbbade7..5945bbbade7 100644
--- a/sql/updates/world/master/2021_05_09_00_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_05_09_00_world.sql
diff --git a/sql/updates/world/master/2021_05_09_01_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_05_09_01_world.sql
index 3ae2ce0af49..3ae2ce0af49 100644
--- a/sql/updates/world/master/2021_05_09_01_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_05_09_01_world.sql
diff --git a/sql/updates/world/master/2021_05_09_02_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_05_09_02_world.sql
index d70fc11ccd7..d70fc11ccd7 100644
--- a/sql/updates/world/master/2021_05_09_02_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_05_09_02_world.sql
diff --git a/sql/updates/world/master/2021_05_09_03_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_05_09_03_world.sql
index e312a2dab2a..e312a2dab2a 100644
--- a/sql/updates/world/master/2021_05_09_03_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_05_09_03_world.sql
diff --git a/sql/updates/world/master/2021_05_09_04_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_05_09_04_world.sql
index a1d28a4bd29..a1d28a4bd29 100644
--- a/sql/updates/world/master/2021_05_09_04_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_05_09_04_world.sql
diff --git a/sql/updates/world/master/2021_05_10_00_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_05_10_00_world.sql
index e6470eb487e..e6470eb487e 100644
--- a/sql/updates/world/master/2021_05_10_00_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_05_10_00_world.sql
diff --git a/sql/updates/world/master/2021_05_10_01_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_05_10_01_world.sql
index 4e293e9aab9..4e293e9aab9 100644
--- a/sql/updates/world/master/2021_05_10_01_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_05_10_01_world.sql
diff --git a/sql/updates/world/master/2021_05_10_02_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_05_10_02_world.sql
index 135bf347418..135bf347418 100644
--- a/sql/updates/world/master/2021_05_10_02_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_05_10_02_world.sql
diff --git a/sql/updates/world/master/2021_05_10_03_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_05_10_03_world.sql
index 1198bd21b60..1198bd21b60 100644
--- a/sql/updates/world/master/2021_05_10_03_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_05_10_03_world.sql
diff --git a/sql/updates/world/master/2021_05_15_00_world_mage_spells.sql b/sql/old/9.x/world/20101_2021_07_04/2021_05_15_00_world_mage_spells.sql
index 1aab8c7ee89..1aab8c7ee89 100644
--- a/sql/updates/world/master/2021_05_15_00_world_mage_spells.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_05_15_00_world_mage_spells.sql
diff --git a/sql/updates/world/master/2021_05_16_00_world_2018_01_04_00_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_05_16_00_world_2018_01_04_00_world.sql
index b320c45379c..b320c45379c 100644
--- a/sql/updates/world/master/2021_05_16_00_world_2018_01_04_00_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_05_16_00_world_2018_01_04_00_world.sql
diff --git a/sql/updates/world/master/2021_05_16_01_world_2017_12_14_02_world_335.sql b/sql/old/9.x/world/20101_2021_07_04/2021_05_16_01_world_2017_12_14_02_world_335.sql
index 2280038c19a..2280038c19a 100644
--- a/sql/updates/world/master/2021_05_16_01_world_2017_12_14_02_world_335.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_05_16_01_world_2017_12_14_02_world_335.sql
diff --git a/sql/updates/world/master/2021_05_16_02_world_2017_12_14_03_world_335.sql b/sql/old/9.x/world/20101_2021_07_04/2021_05_16_02_world_2017_12_14_03_world_335.sql
index 991cdba3f8c..991cdba3f8c 100644
--- a/sql/updates/world/master/2021_05_16_02_world_2017_12_14_03_world_335.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_05_16_02_world_2017_12_14_03_world_335.sql
diff --git a/sql/updates/world/master/2021_05_16_03_world_2017_12_14_04_world_335.sql b/sql/old/9.x/world/20101_2021_07_04/2021_05_16_03_world_2017_12_14_04_world_335.sql
index 1f767db29e8..1f767db29e8 100644
--- a/sql/updates/world/master/2021_05_16_03_world_2017_12_14_04_world_335.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_05_16_03_world_2017_12_14_04_world_335.sql
diff --git a/sql/updates/world/master/2021_05_16_04_world_2018_01_02_06_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_05_16_04_world_2018_01_02_06_world.sql
index 7bd7993b69e..7bd7993b69e 100644
--- a/sql/updates/world/master/2021_05_16_04_world_2018_01_02_06_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_05_16_04_world_2018_01_02_06_world.sql
diff --git a/sql/updates/world/master/2021_05_16_05_world_2018_01_06_00_world_335.sql b/sql/old/9.x/world/20101_2021_07_04/2021_05_16_05_world_2018_01_06_00_world_335.sql
index bac44d70cb9..bac44d70cb9 100644
--- a/sql/updates/world/master/2021_05_16_05_world_2018_01_06_00_world_335.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_05_16_05_world_2018_01_06_00_world_335.sql
diff --git a/sql/updates/world/master/2021_05_16_06_world_2018_01_06_01_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_05_16_06_world_2018_01_06_01_world.sql
index f27ec49887a..f27ec49887a 100644
--- a/sql/updates/world/master/2021_05_16_06_world_2018_01_06_01_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_05_16_06_world_2018_01_06_01_world.sql
diff --git a/sql/updates/world/master/2021_05_16_07_world_2018_01_07_00_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_05_16_07_world_2018_01_07_00_world.sql
index 530233f8fe5..530233f8fe5 100644
--- a/sql/updates/world/master/2021_05_16_07_world_2018_01_07_00_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_05_16_07_world_2018_01_07_00_world.sql
diff --git a/sql/updates/world/master/2021_05_16_08_world_2018_01_07_02_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_05_16_08_world_2018_01_07_02_world.sql
index e06e2d13d1d..e06e2d13d1d 100644
--- a/sql/updates/world/master/2021_05_16_08_world_2018_01_07_02_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_05_16_08_world_2018_01_07_02_world.sql
diff --git a/sql/updates/world/master/2021_05_16_09_world_2018_01_07_03_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_05_16_09_world_2018_01_07_03_world.sql
index 418ba4c7b8a..418ba4c7b8a 100644
--- a/sql/updates/world/master/2021_05_16_09_world_2018_01_07_03_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_05_16_09_world_2018_01_07_03_world.sql
diff --git a/sql/updates/world/master/2021_05_16_10_world_2018_01_07_04_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_05_16_10_world_2018_01_07_04_world.sql
index 839b45990f8..839b45990f8 100644
--- a/sql/updates/world/master/2021_05_16_10_world_2018_01_07_04_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_05_16_10_world_2018_01_07_04_world.sql
diff --git a/sql/updates/world/master/2021_05_16_11_world_2018_01_09_00_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_05_16_11_world_2018_01_09_00_world.sql
index 3e524284dea..3e524284dea 100644
--- a/sql/updates/world/master/2021_05_16_11_world_2018_01_09_00_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_05_16_11_world_2018_01_09_00_world.sql
diff --git a/sql/updates/world/master/2021_05_16_12_world_2018_01_09_02_world_335.sql b/sql/old/9.x/world/20101_2021_07_04/2021_05_16_12_world_2018_01_09_02_world_335.sql
index 8c8b625d272..8c8b625d272 100644
--- a/sql/updates/world/master/2021_05_16_12_world_2018_01_09_02_world_335.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_05_16_12_world_2018_01_09_02_world_335.sql
diff --git a/sql/updates/world/master/2021_05_16_13_world_2018_01_10_00_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_05_16_13_world_2018_01_10_00_world.sql
index 8f06315608c..8f06315608c 100644
--- a/sql/updates/world/master/2021_05_16_13_world_2018_01_10_00_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_05_16_13_world_2018_01_10_00_world.sql
diff --git a/sql/updates/world/master/2021_05_20_00_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_05_20_00_world.sql
index a4dcfbc9bdc..a4dcfbc9bdc 100644
--- a/sql/updates/world/master/2021_05_20_00_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_05_20_00_world.sql
diff --git a/sql/updates/world/master/2021_05_20_01_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_05_20_01_world.sql
index 33b8f0793d6..33b8f0793d6 100644
--- a/sql/updates/world/master/2021_05_20_01_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_05_20_01_world.sql
diff --git a/sql/updates/world/master/2021_05_20_02_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_05_20_02_world.sql
index 68ebd3010ed..68ebd3010ed 100644
--- a/sql/updates/world/master/2021_05_20_02_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_05_20_02_world.sql
diff --git a/sql/updates/world/master/2021_05_22_00_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_05_22_00_world.sql
index f8147ee781c..f8147ee781c 100644
--- a/sql/updates/world/master/2021_05_22_00_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_05_22_00_world.sql
diff --git a/sql/updates/world/master/2021_05_22_01_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_05_22_01_world.sql
index 26fc788c12d..26fc788c12d 100644
--- a/sql/updates/world/master/2021_05_22_01_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_05_22_01_world.sql
diff --git a/sql/updates/world/master/2021_05_27_00_world_mage_spell_alter_time.sql b/sql/old/9.x/world/20101_2021_07_04/2021_05_27_00_world_mage_spell_alter_time.sql
index bceb4d56b3a..bceb4d56b3a 100644
--- a/sql/updates/world/master/2021_05_27_00_world_mage_spell_alter_time.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_05_27_00_world_mage_spell_alter_time.sql
diff --git a/sql/updates/world/master/2021_05_29_00_world_2018_01_10_05_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_05_29_00_world_2018_01_10_05_world.sql
index 40d965881d9..40d965881d9 100644
--- a/sql/updates/world/master/2021_05_29_00_world_2018_01_10_05_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_05_29_00_world_2018_01_10_05_world.sql
diff --git a/sql/updates/world/master/2021_05_29_01_world_2018_01_12_00_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_05_29_01_world_2018_01_12_00_world.sql
index 446fe2e323f..446fe2e323f 100644
--- a/sql/updates/world/master/2021_05_29_01_world_2018_01_12_00_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_05_29_01_world_2018_01_12_00_world.sql
diff --git a/sql/updates/world/master/2021_05_29_02_world_2018_01_12_01_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_05_29_02_world_2018_01_12_01_world.sql
index bd1fe422b8f..bd1fe422b8f 100644
--- a/sql/updates/world/master/2021_05_29_02_world_2018_01_12_01_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_05_29_02_world_2018_01_12_01_world.sql
diff --git a/sql/updates/world/master/2021_05_29_03_world_2018_01_12_02_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_05_29_03_world_2018_01_12_02_world.sql
index a2b14e7655c..a2b14e7655c 100644
--- a/sql/updates/world/master/2021_05_29_03_world_2018_01_12_02_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_05_29_03_world_2018_01_12_02_world.sql
diff --git a/sql/updates/world/master/2021_06_13_00_world_2018_01_13_00_world_335.sql b/sql/old/9.x/world/20101_2021_07_04/2021_06_13_00_world_2018_01_13_00_world_335.sql
index f6d31f51315..f6d31f51315 100644
--- a/sql/updates/world/master/2021_06_13_00_world_2018_01_13_00_world_335.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_06_13_00_world_2018_01_13_00_world_335.sql
diff --git a/sql/updates/world/master/2021_06_16_00_world_2018_01_15_00_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_06_16_00_world_2018_01_15_00_world.sql
index 036a54f7d48..036a54f7d48 100644
--- a/sql/updates/world/master/2021_06_16_00_world_2018_01_15_00_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_06_16_00_world_2018_01_15_00_world.sql
diff --git a/sql/updates/world/master/2021_06_16_01_world_2018_01_16_00_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_06_16_01_world_2018_01_16_00_world.sql
index 6ad1b42cc68..6ad1b42cc68 100644
--- a/sql/updates/world/master/2021_06_16_01_world_2018_01_16_00_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_06_16_01_world_2018_01_16_00_world.sql
diff --git a/sql/updates/world/master/2021_06_16_02_world_2018_01_17_01_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_06_16_02_world_2018_01_17_01_world.sql
index ccbcb0a4502..ccbcb0a4502 100644
--- a/sql/updates/world/master/2021_06_16_02_world_2018_01_17_01_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_06_16_02_world_2018_01_17_01_world.sql
diff --git a/sql/updates/world/master/2021_06_16_03_world_2018_01_18_00_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_06_16_03_world_2018_01_18_00_world.sql
index d34bb6ba161..d34bb6ba161 100644
--- a/sql/updates/world/master/2021_06_16_03_world_2018_01_18_00_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_06_16_03_world_2018_01_18_00_world.sql
diff --git a/sql/updates/world/master/2021_06_16_04_world_2018_01_18_01_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_06_16_04_world_2018_01_18_01_world.sql
index 70b72d77908..70b72d77908 100644
--- a/sql/updates/world/master/2021_06_16_04_world_2018_01_18_01_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_06_16_04_world_2018_01_18_01_world.sql
diff --git a/sql/updates/world/master/2021_06_16_05_world_2018_01_20_00_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_06_16_05_world_2018_01_20_00_world.sql
index e65560f3b01..e65560f3b01 100644
--- a/sql/updates/world/master/2021_06_16_05_world_2018_01_20_00_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_06_16_05_world_2018_01_20_00_world.sql
diff --git a/sql/updates/world/master/2021_06_16_06_world_2018_01_21_00_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_06_16_06_world_2018_01_21_00_world.sql
index 9e2018a9e8d..9e2018a9e8d 100644
--- a/sql/updates/world/master/2021_06_16_06_world_2018_01_21_00_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_06_16_06_world_2018_01_21_00_world.sql
diff --git a/sql/updates/world/master/2021_06_16_07_world_2018_01_24_01_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_06_16_07_world_2018_01_24_01_world.sql
index cf77e551c19..cf77e551c19 100644
--- a/sql/updates/world/master/2021_06_16_07_world_2018_01_24_01_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_06_16_07_world_2018_01_24_01_world.sql
diff --git a/sql/updates/world/master/2021_06_16_08_world_2018_01_24_02_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_06_16_08_world_2018_01_24_02_world.sql
index 294df6dbb94..294df6dbb94 100644
--- a/sql/updates/world/master/2021_06_16_08_world_2018_01_24_02_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_06_16_08_world_2018_01_24_02_world.sql
diff --git a/sql/updates/world/master/2021_06_16_09_world_2018_01_24_03_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_06_16_09_world_2018_01_24_03_world.sql
index 743e1250d74..743e1250d74 100644
--- a/sql/updates/world/master/2021_06_16_09_world_2018_01_24_03_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_06_16_09_world_2018_01_24_03_world.sql
diff --git a/sql/updates/world/master/2021_06_16_10_world_2018_01_24_04_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_06_16_10_world_2018_01_24_04_world.sql
index ef50a71d070..ef50a71d070 100644
--- a/sql/updates/world/master/2021_06_16_10_world_2018_01_24_04_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_06_16_10_world_2018_01_24_04_world.sql
diff --git a/sql/updates/world/master/2021_06_16_11_world_2018_01_24_05_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_06_16_11_world_2018_01_24_05_world.sql
index 3f395f61b1f..3f395f61b1f 100644
--- a/sql/updates/world/master/2021_06_16_11_world_2018_01_24_05_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_06_16_11_world_2018_01_24_05_world.sql
diff --git a/sql/updates/world/master/2021_06_16_12_world_2018_01_24_06_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_06_16_12_world_2018_01_24_06_world.sql
index f8599a2952c..f8599a2952c 100644
--- a/sql/updates/world/master/2021_06_16_12_world_2018_01_24_06_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_06_16_12_world_2018_01_24_06_world.sql
diff --git a/sql/updates/world/master/2021_06_16_13_world_2018_01_25_00_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_06_16_13_world_2018_01_25_00_world.sql
index 1ba2f52acdd..1ba2f52acdd 100644
--- a/sql/updates/world/master/2021_06_16_13_world_2018_01_25_00_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_06_16_13_world_2018_01_25_00_world.sql
diff --git a/sql/updates/world/master/2021_06_16_14_world_2018_01_25_01_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_06_16_14_world_2018_01_25_01_world.sql
index 5bd3757d104..5bd3757d104 100644
--- a/sql/updates/world/master/2021_06_16_14_world_2018_01_25_01_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_06_16_14_world_2018_01_25_01_world.sql
diff --git a/sql/updates/world/master/2021_06_16_15_world_2018_01_25_02_world_335.sql b/sql/old/9.x/world/20101_2021_07_04/2021_06_16_15_world_2018_01_25_02_world_335.sql
index e52cd25de07..e52cd25de07 100644
--- a/sql/updates/world/master/2021_06_16_15_world_2018_01_25_02_world_335.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_06_16_15_world_2018_01_25_02_world_335.sql
diff --git a/sql/updates/world/master/2021_06_16_16_world_2018_01_25_03_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_06_16_16_world_2018_01_25_03_world.sql
index 8a5dac2a534..8a5dac2a534 100644
--- a/sql/updates/world/master/2021_06_16_16_world_2018_01_25_03_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_06_16_16_world_2018_01_25_03_world.sql
diff --git a/sql/updates/world/master/2021_06_16_17_world_2018_01_25_05_world_335.sql b/sql/old/9.x/world/20101_2021_07_04/2021_06_16_17_world_2018_01_25_05_world_335.sql
index dbdcd1a6e50..dbdcd1a6e50 100644
--- a/sql/updates/world/master/2021_06_16_17_world_2018_01_25_05_world_335.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_06_16_17_world_2018_01_25_05_world_335.sql
diff --git a/sql/updates/world/master/2021_06_17_00_world_2018_01_25_06_world_335.sql b/sql/old/9.x/world/20101_2021_07_04/2021_06_17_00_world_2018_01_25_06_world_335.sql
index 49f50ddf9ca..49f50ddf9ca 100644
--- a/sql/updates/world/master/2021_06_17_00_world_2018_01_25_06_world_335.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_06_17_00_world_2018_01_25_06_world_335.sql
diff --git a/sql/updates/world/master/2021_06_18_00_world_2018_01_26_00_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_06_18_00_world_2018_01_26_00_world.sql
index 4753dd2d845..4753dd2d845 100644
--- a/sql/updates/world/master/2021_06_18_00_world_2018_01_26_00_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_06_18_00_world_2018_01_26_00_world.sql
diff --git a/sql/updates/world/master/2021_06_18_01_world_2018_01_28_00_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_06_18_01_world_2018_01_28_00_world.sql
index 2692c016da3..2692c016da3 100644
--- a/sql/updates/world/master/2021_06_18_01_world_2018_01_28_00_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_06_18_01_world_2018_01_28_00_world.sql
diff --git a/sql/updates/world/master/2021_06_19_00_world_2018_01_28_02_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_06_19_00_world_2018_01_28_02_world.sql
index 280591c87ec..280591c87ec 100644
--- a/sql/updates/world/master/2021_06_19_00_world_2018_01_28_02_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_06_19_00_world_2018_01_28_02_world.sql
diff --git a/sql/updates/world/master/2021_06_19_01_world_2018_01_28_03_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_06_19_01_world_2018_01_28_03_world.sql
index a157bb23aa8..a157bb23aa8 100644
--- a/sql/updates/world/master/2021_06_19_01_world_2018_01_28_03_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_06_19_01_world_2018_01_28_03_world.sql
diff --git a/sql/updates/world/master/2021_06_19_02_world_2018_01_29_00_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_06_19_02_world_2018_01_29_00_world.sql
index 2ef44a537cb..2ef44a537cb 100644
--- a/sql/updates/world/master/2021_06_19_02_world_2018_01_29_00_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_06_19_02_world_2018_01_29_00_world.sql
diff --git a/sql/updates/world/master/2021_06_19_03_world_2018_01_30_00_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_06_19_03_world_2018_01_30_00_world.sql
index 01aeecb9ed6..01aeecb9ed6 100644
--- a/sql/updates/world/master/2021_06_19_03_world_2018_01_30_00_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_06_19_03_world_2018_01_30_00_world.sql
diff --git a/sql/updates/world/master/2021_06_19_04_world_2018_02_04_02_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_06_19_04_world_2018_02_04_02_world.sql
index 014a52c7783..014a52c7783 100644
--- a/sql/updates/world/master/2021_06_19_04_world_2018_02_04_02_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_06_19_04_world_2018_02_04_02_world.sql
diff --git a/sql/updates/world/master/2021_06_19_05_world_2018_02_08_00_world_335.sql b/sql/old/9.x/world/20101_2021_07_04/2021_06_19_05_world_2018_02_08_00_world_335.sql
index 7fa291e2486..7fa291e2486 100644
--- a/sql/updates/world/master/2021_06_19_05_world_2018_02_08_00_world_335.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_06_19_05_world_2018_02_08_00_world_335.sql
diff --git a/sql/updates/world/master/2021_06_19_06_world_2018_02_08_01_world_335.sql b/sql/old/9.x/world/20101_2021_07_04/2021_06_19_06_world_2018_02_08_01_world_335.sql
index 40a1c3f0cb4..40a1c3f0cb4 100644
--- a/sql/updates/world/master/2021_06_19_06_world_2018_02_08_01_world_335.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_06_19_06_world_2018_02_08_01_world_335.sql
diff --git a/sql/updates/world/master/2021_06_19_07_world_2018_02_08_02_world_335.sql b/sql/old/9.x/world/20101_2021_07_04/2021_06_19_07_world_2018_02_08_02_world_335.sql
index 61a8fa303b0..61a8fa303b0 100644
--- a/sql/updates/world/master/2021_06_19_07_world_2018_02_08_02_world_335.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_06_19_07_world_2018_02_08_02_world_335.sql
diff --git a/sql/updates/world/master/2021_06_19_08_world_2018_02_08_03_world_335.sql b/sql/old/9.x/world/20101_2021_07_04/2021_06_19_08_world_2018_02_08_03_world_335.sql
index e1fecf17a4d..e1fecf17a4d 100644
--- a/sql/updates/world/master/2021_06_19_08_world_2018_02_08_03_world_335.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_06_19_08_world_2018_02_08_03_world_335.sql
diff --git a/sql/updates/world/master/2021_06_19_09_world_2018_02_08_05_world_335.sql b/sql/old/9.x/world/20101_2021_07_04/2021_06_19_09_world_2018_02_08_05_world_335.sql
index 07134fb590a..07134fb590a 100644
--- a/sql/updates/world/master/2021_06_19_09_world_2018_02_08_05_world_335.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_06_19_09_world_2018_02_08_05_world_335.sql
diff --git a/sql/updates/world/master/2021_06_19_10_world_2018_02_08_06_world_335.sql b/sql/old/9.x/world/20101_2021_07_04/2021_06_19_10_world_2018_02_08_06_world_335.sql
index 4714d0f5e09..4714d0f5e09 100644
--- a/sql/updates/world/master/2021_06_19_10_world_2018_02_08_06_world_335.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_06_19_10_world_2018_02_08_06_world_335.sql
diff --git a/sql/updates/world/master/2021_06_19_11_world_2018_02_08_07_world_335.sql b/sql/old/9.x/world/20101_2021_07_04/2021_06_19_11_world_2018_02_08_07_world_335.sql
index 626f2983e38..626f2983e38 100644
--- a/sql/updates/world/master/2021_06_19_11_world_2018_02_08_07_world_335.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_06_19_11_world_2018_02_08_07_world_335.sql
diff --git a/sql/updates/world/master/2021_06_19_12_world_2018_02_08_08_world_335.sql b/sql/old/9.x/world/20101_2021_07_04/2021_06_19_12_world_2018_02_08_08_world_335.sql
index c985af6e20c..c985af6e20c 100644
--- a/sql/updates/world/master/2021_06_19_12_world_2018_02_08_08_world_335.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_06_19_12_world_2018_02_08_08_world_335.sql
diff --git a/sql/updates/world/master/2021_06_19_13_world_2018_02_08_09_world_335.sql b/sql/old/9.x/world/20101_2021_07_04/2021_06_19_13_world_2018_02_08_09_world_335.sql
index 5843ee32bb5..5843ee32bb5 100644
--- a/sql/updates/world/master/2021_06_19_13_world_2018_02_08_09_world_335.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_06_19_13_world_2018_02_08_09_world_335.sql
diff --git a/sql/updates/world/master/2021_06_19_14_world_2018_02_08_10_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_06_19_14_world_2018_02_08_10_world.sql
index 24d0f839e11..24d0f839e11 100644
--- a/sql/updates/world/master/2021_06_19_14_world_2018_02_08_10_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_06_19_14_world_2018_02_08_10_world.sql
diff --git a/sql/updates/world/master/2021_06_19_15_world_2018_02_09_01_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_06_19_15_world_2018_02_09_01_world.sql
index 4b5d7be403a..4b5d7be403a 100644
--- a/sql/updates/world/master/2021_06_19_15_world_2018_02_09_01_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_06_19_15_world_2018_02_09_01_world.sql
diff --git a/sql/updates/world/master/2021_06_19_16_world_2018_02_10_00_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_06_19_16_world_2018_02_10_00_world.sql
index ad19973dc22..ad19973dc22 100644
--- a/sql/updates/world/master/2021_06_19_16_world_2018_02_10_00_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_06_19_16_world_2018_02_10_00_world.sql
diff --git a/sql/updates/world/master/2021_06_19_17_world_2018_02_10_01_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_06_19_17_world_2018_02_10_01_world.sql
index f8d0d348522..f8d0d348522 100644
--- a/sql/updates/world/master/2021_06_19_17_world_2018_02_10_01_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_06_19_17_world_2018_02_10_01_world.sql
diff --git a/sql/updates/world/master/2021_06_19_18_world_2018_02_11_01_world_335.sql b/sql/old/9.x/world/20101_2021_07_04/2021_06_19_18_world_2018_02_11_01_world_335.sql
index 32e66bb68fd..32e66bb68fd 100644
--- a/sql/updates/world/master/2021_06_19_18_world_2018_02_11_01_world_335.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_06_19_18_world_2018_02_11_01_world_335.sql
diff --git a/sql/updates/world/master/2021_06_19_19_world_2018_02_11_02_world_335.sql b/sql/old/9.x/world/20101_2021_07_04/2021_06_19_19_world_2018_02_11_02_world_335.sql
index 5a98c0da863..5a98c0da863 100644
--- a/sql/updates/world/master/2021_06_19_19_world_2018_02_11_02_world_335.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_06_19_19_world_2018_02_11_02_world_335.sql
diff --git a/sql/updates/world/master/2021_06_19_20_world_2018_02_12_00_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_06_19_20_world_2018_02_12_00_world.sql
index 8349cbe23c2..8349cbe23c2 100644
--- a/sql/updates/world/master/2021_06_19_20_world_2018_02_12_00_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_06_19_20_world_2018_02_12_00_world.sql
diff --git a/sql/updates/world/master/2021_06_19_21_world_2018_02_12_01_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_06_19_21_world_2018_02_12_01_world.sql
index 4ff4dafec07..4ff4dafec07 100644
--- a/sql/updates/world/master/2021_06_19_21_world_2018_02_12_01_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_06_19_21_world_2018_02_12_01_world.sql
diff --git a/sql/updates/world/master/2021_06_20_00_world_2018_02_12_02_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_06_20_00_world_2018_02_12_02_world.sql
index 98913424a12..98913424a12 100644
--- a/sql/updates/world/master/2021_06_20_00_world_2018_02_12_02_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_06_20_00_world_2018_02_12_02_world.sql
diff --git a/sql/updates/world/master/2021_06_20_01_world_2018_02_13_00_world_335.sql b/sql/old/9.x/world/20101_2021_07_04/2021_06_20_01_world_2018_02_13_00_world_335.sql
index 6b8ab7cfb9c..6b8ab7cfb9c 100644
--- a/sql/updates/world/master/2021_06_20_01_world_2018_02_13_00_world_335.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_06_20_01_world_2018_02_13_00_world_335.sql
diff --git a/sql/updates/world/master/2021_06_20_02_world_2018_02_13_01_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_06_20_02_world_2018_02_13_01_world.sql
index e2efbd4b0ee..e2efbd4b0ee 100644
--- a/sql/updates/world/master/2021_06_20_02_world_2018_02_13_01_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_06_20_02_world_2018_02_13_01_world.sql
diff --git a/sql/updates/world/master/2021_06_20_03_world_2018_02_13_02_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_06_20_03_world_2018_02_13_02_world.sql
index 713a4d5d89a..713a4d5d89a 100644
--- a/sql/updates/world/master/2021_06_20_03_world_2018_02_13_02_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_06_20_03_world_2018_02_13_02_world.sql
diff --git a/sql/updates/world/master/2021_06_20_04_world_2018_02_13_03_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_06_20_04_world_2018_02_13_03_world.sql
index 32c53176b5e..32c53176b5e 100644
--- a/sql/updates/world/master/2021_06_20_04_world_2018_02_13_03_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_06_20_04_world_2018_02_13_03_world.sql
diff --git a/sql/updates/world/master/2021_06_20_05_world_2018_02_13_04_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_06_20_05_world_2018_02_13_04_world.sql
index 2a99ff63b5a..2a99ff63b5a 100644
--- a/sql/updates/world/master/2021_06_20_05_world_2018_02_13_04_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_06_20_05_world_2018_02_13_04_world.sql
diff --git a/sql/updates/world/master/2021_06_20_06_world_2018_02_13_05_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_06_20_06_world_2018_02_13_05_world.sql
index 403eb6212fd..403eb6212fd 100644
--- a/sql/updates/world/master/2021_06_20_06_world_2018_02_13_05_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_06_20_06_world_2018_02_13_05_world.sql
diff --git a/sql/updates/world/master/2021_06_20_07_world_2018_02_13_06_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_06_20_07_world_2018_02_13_06_world.sql
index ace74714042..ace74714042 100644
--- a/sql/updates/world/master/2021_06_20_07_world_2018_02_13_06_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_06_20_07_world_2018_02_13_06_world.sql
diff --git a/sql/updates/world/master/2021_06_20_08_world_2018_02_13_07_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_06_20_08_world_2018_02_13_07_world.sql
index 1afb5c37cf9..1afb5c37cf9 100644
--- a/sql/updates/world/master/2021_06_20_08_world_2018_02_13_07_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_06_20_08_world_2018_02_13_07_world.sql
diff --git a/sql/updates/world/master/2021_06_20_09_world_2018_02_14_00_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_06_20_09_world_2018_02_14_00_world.sql
index 6139607d986..6139607d986 100644
--- a/sql/updates/world/master/2021_06_20_09_world_2018_02_14_00_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_06_20_09_world_2018_02_14_00_world.sql
diff --git a/sql/updates/world/master/2021_06_20_10_world_2018_02_14_08_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_06_20_10_world_2018_02_14_08_world.sql
index f5d3bf5b3ab..f5d3bf5b3ab 100644
--- a/sql/updates/world/master/2021_06_20_10_world_2018_02_14_08_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_06_20_10_world_2018_02_14_08_world.sql
diff --git a/sql/updates/world/master/2021_06_20_11_world_2018_02_14_01_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_06_20_11_world_2018_02_14_01_world.sql
index 097e6453681..097e6453681 100644
--- a/sql/updates/world/master/2021_06_20_11_world_2018_02_14_01_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_06_20_11_world_2018_02_14_01_world.sql
diff --git a/sql/updates/world/master/2021_06_21_00_world_2018_02_15_01_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_06_21_00_world_2018_02_15_01_world.sql
index 7269754e5e0..7269754e5e0 100644
--- a/sql/updates/world/master/2021_06_21_00_world_2018_02_15_01_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_06_21_00_world_2018_02_15_01_world.sql
diff --git a/sql/updates/world/master/2021_06_21_01_world_2018_02_15_02_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_06_21_01_world_2018_02_15_02_world.sql
index afea6071092..afea6071092 100644
--- a/sql/updates/world/master/2021_06_21_01_world_2018_02_15_02_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_06_21_01_world_2018_02_15_02_world.sql
diff --git a/sql/updates/world/master/2021_06_21_02_world_2018_02_15_03_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_06_21_02_world_2018_02_15_03_world.sql
index 72c8613c57e..72c8613c57e 100644
--- a/sql/updates/world/master/2021_06_21_02_world_2018_02_15_03_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_06_21_02_world_2018_02_15_03_world.sql
diff --git a/sql/updates/world/master/2021_06_21_03_world_2018_02_15_04_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_06_21_03_world_2018_02_15_04_world.sql
index 262e0c7b032..262e0c7b032 100644
--- a/sql/updates/world/master/2021_06_21_03_world_2018_02_15_04_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_06_21_03_world_2018_02_15_04_world.sql
diff --git a/sql/updates/world/master/2021_06_22_00_world_2018_02_16_00_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_06_22_00_world_2018_02_16_00_world.sql
index 35cdaf23c53..35cdaf23c53 100644
--- a/sql/updates/world/master/2021_06_22_00_world_2018_02_16_00_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_06_22_00_world_2018_02_16_00_world.sql
diff --git a/sql/updates/world/master/2021_06_22_01_world_2018_02_16_01_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_06_22_01_world_2018_02_16_01_world.sql
index c1250335076..c1250335076 100644
--- a/sql/updates/world/master/2021_06_22_01_world_2018_02_16_01_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_06_22_01_world_2018_02_16_01_world.sql
diff --git a/sql/updates/world/master/2021_06_22_02_world_2018_02_16_02_world.sql b/sql/old/9.x/world/20101_2021_07_04/2021_06_22_02_world_2018_02_16_02_world.sql
index ac6733d1059..ac6733d1059 100644
--- a/sql/updates/world/master/2021_06_22_02_world_2018_02_16_02_world.sql
+++ b/sql/old/9.x/world/20101_2021_07_04/2021_06_22_02_world_2018_02_16_02_world.sql
diff --git a/sql/updates/auth/master/2021_07_04_00_auth.sql b/sql/updates/auth/master/2021_07_04_00_auth.sql
new file mode 100644
index 00000000000..ab0782353e8
--- /dev/null
+++ b/sql/updates/auth/master/2021_07_04_00_auth.sql
@@ -0,0 +1,3 @@
+-- TDB 905.21071 auth
+UPDATE `updates` SET `state`='ARCHIVED',`speed`=0;
+REPLACE INTO `updates_include` (`path`, `state`) VALUES ('$/sql/old/9.x/auth', 'ARCHIVED');
diff --git a/sql/updates/characters/master/2021_07_04_00_characters.sql b/sql/updates/characters/master/2021_07_04_00_characters.sql
new file mode 100644
index 00000000000..58b6234e08c
--- /dev/null
+++ b/sql/updates/characters/master/2021_07_04_00_characters.sql
@@ -0,0 +1,3 @@
+-- TDB 905.21071 characters
+UPDATE `updates` SET `state`='ARCHIVED',`speed`=0;
+REPLACE INTO `updates_include` (`path`, `state`) VALUES ('$/sql/old/9.x/characters', 'ARCHIVED');
diff --git a/sql/updates/hotfixes/master/2021_07_04_00_hotfixes.sql b/sql/updates/hotfixes/master/2021_07_04_00_hotfixes.sql
new file mode 100644
index 00000000000..7441eb81f59
--- /dev/null
+++ b/sql/updates/hotfixes/master/2021_07_04_00_hotfixes.sql
@@ -0,0 +1,3 @@
+-- TDB 905.21071 hotfixes
+UPDATE `updates` SET `state`='ARCHIVED',`speed`=0;
+REPLACE INTO `updates_include` (`path`, `state`) VALUES ('$/sql/old/9.x/hotfixes', 'ARCHIVED');
diff --git a/sql/updates/world/master/2021_07_04_00_world.sql b/sql/updates/world/master/2021_07_04_00_world.sql
new file mode 100644
index 00000000000..dfbf7d77dcf
--- /dev/null
+++ b/sql/updates/world/master/2021_07_04_00_world.sql
@@ -0,0 +1,4 @@
+-- TDB 905.21071 world
+UPDATE `version` SET `db_version`='TDB 905.21071', `cache_id`=21071 LIMIT 1;
+UPDATE `updates` SET `state`='ARCHIVED',`speed`=0;
+REPLACE INTO `updates_include` (`path`, `state`) VALUES ('$/sql/old/9.x/world', 'ARCHIVED');