diff --git a/revision_data.h.in.cmake b/revision_data.h.in.cmake
index 627e43a2ac0..a085d243064 100644
--- a/revision_data.h.in.cmake
+++ b/revision_data.h.in.cmake
@@ -9,7 +9,7 @@
  #define _SOURCE_DIRECTORY          R"(@CMAKE_SOURCE_DIR@)"
  #define _BUILD_DIRECTORY           R"(@BUILDDIR@)"
  #define _MYSQL_EXECUTABLE          R"(@MYSQL_EXECUTABLE@)"
- #define _FULL_DATABASE             "TDB_full_world_335.21061_2021_06_15.sql"
+ #define _FULL_DATABASE             "TDB_full_world_335.21071_2021_07_15.sql"
  #define VER_COMPANYNAME_STR        "TrinityCore Developers"
  #define VER_LEGALCOPYRIGHT_STR     "(c)2008-@rev_year@ TrinityCore"
  #define VER_FILEVERSION            0,0,0
diff --git a/sql/base/auth_database.sql b/sql/base/auth_database.sql
index b13104f9192..e2b97df7aaf 100644
--- a/sql/base/auth_database.sql
+++ b/sql/base/auth_database.sql
@@ -1987,7 +1987,8 @@ INSERT INTO `updates` VALUES
 ('2021_04_16_00_auth.sql','737670762C2AE4E04BFC2C2B0B6F3C71DCDF6C44','ARCHIVED','2021-04-16 21:23:03',0),
 ('2021_05_14_00_auth.sql','B89998D90CCFEB2480838D417AC9661372A6B959','ARCHIVED','2021-05-14 12:20:33',0),
 ('2021_06_15_00_auth.sql','DAFFA7699D3BF0A15AE72321AFC9F7D22F33B65C','ARCHIVED','2021-06-15 11:53:33',0),
-('2021_06_20_00_auth.sql','7CA418D570DC1444C19AAD18F4A50FF187642310','ARCHIVED','2021-06-20 17:29:17',0);
+('2021_06_20_00_auth.sql','7CA418D570DC1444C19AAD18F4A50FF187642310','ARCHIVED','2021-06-20 17:29:17',0),
+('2021_07_15_00_auth.sql','C8B29D477A5A6704775517EF8203871BFE3D4906','ARCHIVED','2021-07-15 07:32:48',0);
 /*!40000 ALTER TABLE `updates` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -2126,4 +2127,4 @@ SET character_set_client = @saved_cs_client;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2021-06-20 20:56:14
+-- Dump completed on 2021-07-15  7:32:51
diff --git a/sql/base/characters_database.sql b/sql/base/characters_database.sql
index 6c1e72a35ce..1dbed596dcf 100644
--- a/sql/base/characters_database.sql
+++ b/sql/base/characters_database.sql
@@ -2662,7 +2662,8 @@ INSERT INTO `updates` VALUES
 ('2021_03_15_00_characters.sql','D6274D688A3E2A4F727B565481D99A49E9C642D4','ARCHIVED','2021-03-15 17:31:39',0),
 ('2021_04_16_00_characters.sql','0EBBF50CE3EB1197973E403C2F1D60881BB497FD','ARCHIVED','2021-04-16 21:23:03',0),
 ('2021_05_14_00_characters.sql','9834A657E1E1F650E9A7E4E793BAB3E2AFF65293','ARCHIVED','2021-05-14 12:20:33',0),
-('2021_06_15_00_characters.sql','4432846E2B0769C01E2B333EEDD90ABA44BF2BC1','ARCHIVED','2021-06-15 11:53:33',0);
+('2021_06_15_00_characters.sql','4432846E2B0769C01E2B333EEDD90ABA44BF2BC1','ARCHIVED','2021-06-15 11:53:33',0),
+('2021_07_15_00_characters.sql','2ACFF71253DEA0F059476AEA52A55196E6D5DCFE','ARCHIVED','2021-07-15 07:32:48',0);
 /*!40000 ALTER TABLE `updates` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -2833,4 +2834,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2021-06-15 11:53:35
+-- Dump completed on 2021-07-15  7:32:51
diff --git a/sql/base/dev/world_database.sql b/sql/base/dev/world_database.sql
index 32bb8110514..6df70474aad 100644
--- a/sql/base/dev/world_database.sql
+++ b/sql/base/dev/world_database.sql
@@ -4044,4 +4044,4 @@ CREATE TABLE `waypoints` (
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2021-06-15 11:53:36
+-- Dump completed on 2021-07-15  7:32:51
diff --git a/sql/updates/auth/3.3.5/2021_06_15_00_auth.sql b/sql/old/3.3.5a/auth/21061_2021_07_15/2021_06_15_00_auth.sql
similarity index 100%
rename from sql/updates/auth/3.3.5/2021_06_15_00_auth.sql
rename to sql/old/3.3.5a/auth/21061_2021_07_15/2021_06_15_00_auth.sql
diff --git a/sql/updates/auth/3.3.5/2021_06_20_00_auth.sql b/sql/old/3.3.5a/auth/21061_2021_07_15/2021_06_20_00_auth.sql
similarity index 100%
rename from sql/updates/auth/3.3.5/2021_06_20_00_auth.sql
rename to sql/old/3.3.5a/auth/21061_2021_07_15/2021_06_20_00_auth.sql
diff --git a/sql/updates/characters/3.3.5/2021_06_15_00_characters.sql b/sql/old/3.3.5a/characters/21061_2021_07_15/2021_06_15_00_characters.sql
similarity index 100%
rename from sql/updates/characters/3.3.5/2021_06_15_00_characters.sql
rename to sql/old/3.3.5a/characters/21061_2021_07_15/2021_06_15_00_characters.sql
diff --git a/sql/updates/world/3.3.5/2021_06_15_00_world.sql b/sql/old/3.3.5a/world/21061_2021_07_15/2021_06_15_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_06_15_00_world.sql
rename to sql/old/3.3.5a/world/21061_2021_07_15/2021_06_15_00_world.sql
diff --git a/sql/updates/world/3.3.5/2021_06_17_00_world.sql b/sql/old/3.3.5a/world/21061_2021_07_15/2021_06_17_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_06_17_00_world.sql
rename to sql/old/3.3.5a/world/21061_2021_07_15/2021_06_17_00_world.sql
diff --git a/sql/updates/world/3.3.5/2021_06_20_00_world.sql b/sql/old/3.3.5a/world/21061_2021_07_15/2021_06_20_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_06_20_00_world.sql
rename to sql/old/3.3.5a/world/21061_2021_07_15/2021_06_20_00_world.sql
diff --git a/sql/updates/world/3.3.5/2021_06_22_00_world.sql b/sql/old/3.3.5a/world/21061_2021_07_15/2021_06_22_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_06_22_00_world.sql
rename to sql/old/3.3.5a/world/21061_2021_07_15/2021_06_22_00_world.sql
diff --git a/sql/updates/world/3.3.5/2021_06_22_01_world_335.sql b/sql/old/3.3.5a/world/21061_2021_07_15/2021_06_22_01_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_06_22_01_world_335.sql
rename to sql/old/3.3.5a/world/21061_2021_07_15/2021_06_22_01_world_335.sql
diff --git a/sql/updates/world/3.3.5/2021_06_22_02_world_335.sql b/sql/old/3.3.5a/world/21061_2021_07_15/2021_06_22_02_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_06_22_02_world_335.sql
rename to sql/old/3.3.5a/world/21061_2021_07_15/2021_06_22_02_world_335.sql
diff --git a/sql/updates/world/3.3.5/2021_06_22_03_world_335.sql b/sql/old/3.3.5a/world/21061_2021_07_15/2021_06_22_03_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_06_22_03_world_335.sql
rename to sql/old/3.3.5a/world/21061_2021_07_15/2021_06_22_03_world_335.sql
diff --git a/sql/updates/world/3.3.5/2021_06_22_04_world_335.sql b/sql/old/3.3.5a/world/21061_2021_07_15/2021_06_22_04_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_06_22_04_world_335.sql
rename to sql/old/3.3.5a/world/21061_2021_07_15/2021_06_22_04_world_335.sql
diff --git a/sql/updates/world/3.3.5/2021_06_22_05_world.sql b/sql/old/3.3.5a/world/21061_2021_07_15/2021_06_22_05_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_06_22_05_world.sql
rename to sql/old/3.3.5a/world/21061_2021_07_15/2021_06_22_05_world.sql
diff --git a/sql/updates/world/3.3.5/2021_06_23_00_world.sql b/sql/old/3.3.5a/world/21061_2021_07_15/2021_06_23_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_06_23_00_world.sql
rename to sql/old/3.3.5a/world/21061_2021_07_15/2021_06_23_00_world.sql
diff --git a/sql/updates/world/3.3.5/2021_06_24_00_world.sql b/sql/old/3.3.5a/world/21061_2021_07_15/2021_06_24_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_06_24_00_world.sql
rename to sql/old/3.3.5a/world/21061_2021_07_15/2021_06_24_00_world.sql
diff --git a/sql/updates/world/3.3.5/2021_06_24_01_world.sql b/sql/old/3.3.5a/world/21061_2021_07_15/2021_06_24_01_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_06_24_01_world.sql
rename to sql/old/3.3.5a/world/21061_2021_07_15/2021_06_24_01_world.sql
diff --git a/sql/updates/world/3.3.5/2021_06_24_02_world.sql b/sql/old/3.3.5a/world/21061_2021_07_15/2021_06_24_02_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_06_24_02_world.sql
rename to sql/old/3.3.5a/world/21061_2021_07_15/2021_06_24_02_world.sql
diff --git a/sql/updates/world/3.3.5/2021_06_24_03_world.sql b/sql/old/3.3.5a/world/21061_2021_07_15/2021_06_24_03_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_06_24_03_world.sql
rename to sql/old/3.3.5a/world/21061_2021_07_15/2021_06_24_03_world.sql
diff --git a/sql/updates/world/3.3.5/2021_06_24_04_world.sql b/sql/old/3.3.5a/world/21061_2021_07_15/2021_06_24_04_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_06_24_04_world.sql
rename to sql/old/3.3.5a/world/21061_2021_07_15/2021_06_24_04_world.sql
diff --git a/sql/updates/world/3.3.5/2021_06_24_05_world.sql b/sql/old/3.3.5a/world/21061_2021_07_15/2021_06_24_05_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_06_24_05_world.sql
rename to sql/old/3.3.5a/world/21061_2021_07_15/2021_06_24_05_world.sql
diff --git a/sql/updates/world/3.3.5/2021_06_27_00_world_335.sql b/sql/old/3.3.5a/world/21061_2021_07_15/2021_06_27_00_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_06_27_00_world_335.sql
rename to sql/old/3.3.5a/world/21061_2021_07_15/2021_06_27_00_world_335.sql
diff --git a/sql/updates/world/3.3.5/2021_06_27_01_world.sql b/sql/old/3.3.5a/world/21061_2021_07_15/2021_06_27_01_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_06_27_01_world.sql
rename to sql/old/3.3.5a/world/21061_2021_07_15/2021_06_27_01_world.sql
diff --git a/sql/updates/world/3.3.5/2021_06_27_02_world_335.sql b/sql/old/3.3.5a/world/21061_2021_07_15/2021_06_27_02_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_06_27_02_world_335.sql
rename to sql/old/3.3.5a/world/21061_2021_07_15/2021_06_27_02_world_335.sql
diff --git a/sql/updates/world/3.3.5/2021_06_27_03_world_335.sql b/sql/old/3.3.5a/world/21061_2021_07_15/2021_06_27_03_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_06_27_03_world_335.sql
rename to sql/old/3.3.5a/world/21061_2021_07_15/2021_06_27_03_world_335.sql
diff --git a/sql/updates/world/3.3.5/2021_06_27_04_world.sql b/sql/old/3.3.5a/world/21061_2021_07_15/2021_06_27_04_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_06_27_04_world.sql
rename to sql/old/3.3.5a/world/21061_2021_07_15/2021_06_27_04_world.sql
diff --git a/sql/updates/world/3.3.5/2021_06_27_05_world.sql b/sql/old/3.3.5a/world/21061_2021_07_15/2021_06_27_05_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_06_27_05_world.sql
rename to sql/old/3.3.5a/world/21061_2021_07_15/2021_06_27_05_world.sql
diff --git a/sql/updates/world/3.3.5/2021_06_29_00_world_335.sql b/sql/old/3.3.5a/world/21061_2021_07_15/2021_06_29_00_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_06_29_00_world_335.sql
rename to sql/old/3.3.5a/world/21061_2021_07_15/2021_06_29_00_world_335.sql
diff --git a/sql/updates/world/3.3.5/2021_07_03_00_world.sql b/sql/old/3.3.5a/world/21061_2021_07_15/2021_07_03_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_07_03_00_world.sql
rename to sql/old/3.3.5a/world/21061_2021_07_15/2021_07_03_00_world.sql
diff --git a/sql/updates/world/3.3.5/2021_07_03_01_world.sql b/sql/old/3.3.5a/world/21061_2021_07_15/2021_07_03_01_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_07_03_01_world.sql
rename to sql/old/3.3.5a/world/21061_2021_07_15/2021_07_03_01_world.sql
diff --git a/sql/updates/world/3.3.5/2021_07_04_00_world.sql b/sql/old/3.3.5a/world/21061_2021_07_15/2021_07_04_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_07_04_00_world.sql
rename to sql/old/3.3.5a/world/21061_2021_07_15/2021_07_04_00_world.sql
diff --git a/sql/updates/world/3.3.5/2021_07_06_00_world_335.sql b/sql/old/3.3.5a/world/21061_2021_07_15/2021_07_06_00_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_07_06_00_world_335.sql
rename to sql/old/3.3.5a/world/21061_2021_07_15/2021_07_06_00_world_335.sql
diff --git a/sql/updates/world/3.3.5/2021_07_06_01_world_335.sql b/sql/old/3.3.5a/world/21061_2021_07_15/2021_07_06_01_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_07_06_01_world_335.sql
rename to sql/old/3.3.5a/world/21061_2021_07_15/2021_07_06_01_world_335.sql
diff --git a/sql/updates/world/3.3.5/2021_07_06_02_world.sql b/sql/old/3.3.5a/world/21061_2021_07_15/2021_07_06_02_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_07_06_02_world.sql
rename to sql/old/3.3.5a/world/21061_2021_07_15/2021_07_06_02_world.sql
diff --git a/sql/updates/world/3.3.5/2021_07_06_03_world.sql b/sql/old/3.3.5a/world/21061_2021_07_15/2021_07_06_03_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_07_06_03_world.sql
rename to sql/old/3.3.5a/world/21061_2021_07_15/2021_07_06_03_world.sql
diff --git a/sql/updates/world/3.3.5/2021_07_07_00_world_335.sql b/sql/old/3.3.5a/world/21061_2021_07_15/2021_07_07_00_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_07_07_00_world_335.sql
rename to sql/old/3.3.5a/world/21061_2021_07_15/2021_07_07_00_world_335.sql
diff --git a/sql/updates/world/3.3.5/2021_07_07_01_world_335.sql b/sql/old/3.3.5a/world/21061_2021_07_15/2021_07_07_01_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_07_07_01_world_335.sql
rename to sql/old/3.3.5a/world/21061_2021_07_15/2021_07_07_01_world_335.sql
diff --git a/sql/updates/world/3.3.5/2021_07_11_00_world.sql b/sql/old/3.3.5a/world/21061_2021_07_15/2021_07_11_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_07_11_00_world.sql
rename to sql/old/3.3.5a/world/21061_2021_07_15/2021_07_11_00_world.sql
diff --git a/sql/updates/world/3.3.5/2021_07_13_00_world.sql b/sql/old/3.3.5a/world/21061_2021_07_15/2021_07_13_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_07_13_00_world.sql
rename to sql/old/3.3.5a/world/21061_2021_07_15/2021_07_13_00_world.sql
diff --git a/sql/updates/auth/3.3.5/2021_07_15_00_auth.sql b/sql/updates/auth/3.3.5/2021_07_15_00_auth.sql
new file mode 100644
index 00000000000..7b8b20b47a2
--- /dev/null
+++ b/sql/updates/auth/3.3.5/2021_07_15_00_auth.sql
@@ -0,0 +1,2 @@
+-- TDB 335.21071 auth
+UPDATE `updates` SET `state`='ARCHIVED';
diff --git a/sql/updates/characters/3.3.5/2021_07_15_00_characters.sql b/sql/updates/characters/3.3.5/2021_07_15_00_characters.sql
new file mode 100644
index 00000000000..97589672ab0
--- /dev/null
+++ b/sql/updates/characters/3.3.5/2021_07_15_00_characters.sql
@@ -0,0 +1,2 @@
+-- TDB 335.21071 characters
+UPDATE `updates` SET `state`='ARCHIVED';
diff --git a/sql/updates/world/3.3.5/2021_07_15_00_world.sql b/sql/updates/world/3.3.5/2021_07_15_00_world.sql
new file mode 100644
index 00000000000..b84cd9e4694
--- /dev/null
+++ b/sql/updates/world/3.3.5/2021_07_15_00_world.sql
@@ -0,0 +1,3 @@
+-- TDB 335.21071 world
+UPDATE `version` SET `db_version`='TDB 335.21071', `cache_id`=21071 LIMIT 1;
+UPDATE `updates` SET `state`='ARCHIVED';