diff --git a/revision_data.h.in.cmake b/revision_data.h.in.cmake
index a539e984489..0b967bbb2c9 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.21041_2021_04_16.sql"
+ #define _FULL_DATABASE             "TDB_full_world_335.21051_2021_05_14.sql"
  #define VER_COMPANYNAME_STR        "TrinityCore Developers"
  #define VER_LEGALCOPYRIGHT_STR     "(c)2008-2019 TrinityCore"
  #define VER_FILEVERSION            0,0,0
diff --git a/sql/base/auth_database.sql b/sql/base/auth_database.sql
index 843bc05a772..f28e5ac087e 100644
--- a/sql/base/auth_database.sql
+++ b/sql/base/auth_database.sql
@@ -1,8 +1,8 @@
--- MySQL dump 10.13  Distrib 5.7.32, for Linux (x86_64)
+-- MySQL dump 10.13  Distrib 5.7.34, for Linux (x86_64)
 --
 -- Host: localhost    Database: auth
 -- ------------------------------------------------------
--- Server version	5.7.32-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 */;
@@ -1984,7 +1984,8 @@ INSERT INTO `updates` VALUES
 ('2021_01_15_00_auth.sql','604B8B799F031C1074314D4D8081797CC8B22FE2','ARCHIVED','2021-01-15 08:29:32',0),
 ('2021_02_15_00_auth.sql','652C38A140C0B2C7E898A2F7A7AC799CA2440315','ARCHIVED','2021-02-15 12:37:46',0),
 ('2021_03_15_00_auth.sql','571D2FD6A62F066CC789C73A4ECDD613C6FF5F10','ARCHIVED','2021-03-15 17:31:39',0),
-('2021_04_16_00_auth.sql','737670762C2AE4E04BFC2C2B0B6F3C71DCDF6C44','ARCHIVED','2021-04-16 21:23:03',0);
+('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);
 /*!40000 ALTER TABLE `updates` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -2090,4 +2091,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-04-16 21:23:04
+-- Dump completed on 2021-05-14 12:20:36
diff --git a/sql/base/characters_database.sql b/sql/base/characters_database.sql
index 78495d11744..78393753b58 100644
--- a/sql/base/characters_database.sql
+++ b/sql/base/characters_database.sql
@@ -1,8 +1,8 @@
--- MySQL dump 10.13  Distrib 5.7.32, for Linux (x86_64)
+-- MySQL dump 10.13  Distrib 5.7.34, for Linux (x86_64)
 --
 -- Host: localhost    Database: characters
 -- ------------------------------------------------------
--- Server version	5.7.32-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 */;
@@ -2660,7 +2660,8 @@ INSERT INTO `updates` VALUES
 ('2021_01_15_00_characters.sql','4D3A4C71ACD4CB04B014C300E1D0B33C0699DBE7','ARCHIVED','2021-01-15 08:29:32',0),
 ('2021_02_15_00_characters.sql','53D94CFC60329E7BD036B77D4B298785AF57AD79','ARCHIVED','2021-02-15 12:37:46',0),
 ('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_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);
 /*!40000 ALTER TABLE `updates` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -2831,4 +2832,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2021-04-16 21:23:04
+-- Dump completed on 2021-05-14 12:20:36
diff --git a/sql/base/dev/world_database.sql b/sql/base/dev/world_database.sql
index 6a4ffa97503..267aa14c743 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.32, for Linux (x86_64)
+-- MySQL dump 10.13  Distrib 5.7.34, for Linux (x86_64)
 --
 -- Host: localhost    Database: world
 -- ------------------------------------------------------
--- Server version	5.7.32-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 */;
@@ -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-04-16 21:23:05
+-- Dump completed on 2021-05-14 12:20:37
diff --git a/sql/updates/auth/3.3.5/2021_04_16_00_auth.sql b/sql/old/3.3.5a/auth/21041_2021_05_14/2021_04_16_00_auth.sql
similarity index 100%
rename from sql/updates/auth/3.3.5/2021_04_16_00_auth.sql
rename to sql/old/3.3.5a/auth/21041_2021_05_14/2021_04_16_00_auth.sql
diff --git a/sql/updates/characters/3.3.5/2021_04_16_00_characters.sql b/sql/old/3.3.5a/characters/21041_2021_05_14/2021_04_16_00_characters.sql
similarity index 100%
rename from sql/updates/characters/3.3.5/2021_04_16_00_characters.sql
rename to sql/old/3.3.5a/characters/21041_2021_05_14/2021_04_16_00_characters.sql
diff --git a/sql/updates/world/3.3.5/2021_04_16_00_world.sql b/sql/old/3.3.5a/world/21041_2021_05_14/2021_04_16_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_04_16_00_world.sql
rename to sql/old/3.3.5a/world/21041_2021_05_14/2021_04_16_00_world.sql
diff --git a/sql/updates/world/3.3.5/2021_04_19_00_world.sql b/sql/old/3.3.5a/world/21041_2021_05_14/2021_04_19_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_04_19_00_world.sql
rename to sql/old/3.3.5a/world/21041_2021_05_14/2021_04_19_00_world.sql
diff --git a/sql/updates/world/3.3.5/2021_04_23_00_world.sql b/sql/old/3.3.5a/world/21041_2021_05_14/2021_04_23_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_04_23_00_world.sql
rename to sql/old/3.3.5a/world/21041_2021_05_14/2021_04_23_00_world.sql
diff --git a/sql/updates/world/3.3.5/2021_04_25_00_world.sql b/sql/old/3.3.5a/world/21041_2021_05_14/2021_04_25_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_04_25_00_world.sql
rename to sql/old/3.3.5a/world/21041_2021_05_14/2021_04_25_00_world.sql
diff --git a/sql/updates/world/3.3.5/2021_04_28_00_world_335.sql b/sql/old/3.3.5a/world/21041_2021_05_14/2021_04_28_00_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_04_28_00_world_335.sql
rename to sql/old/3.3.5a/world/21041_2021_05_14/2021_04_28_00_world_335.sql
diff --git a/sql/updates/world/3.3.5/2021_04_28_01_world_335.sql b/sql/old/3.3.5a/world/21041_2021_05_14/2021_04_28_01_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_04_28_01_world_335.sql
rename to sql/old/3.3.5a/world/21041_2021_05_14/2021_04_28_01_world_335.sql
diff --git a/sql/updates/world/3.3.5/2021_04_28_02_world_335.sql b/sql/old/3.3.5a/world/21041_2021_05_14/2021_04_28_02_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_04_28_02_world_335.sql
rename to sql/old/3.3.5a/world/21041_2021_05_14/2021_04_28_02_world_335.sql
diff --git a/sql/updates/world/3.3.5/2021_04_28_03_world_335.sql b/sql/old/3.3.5a/world/21041_2021_05_14/2021_04_28_03_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_04_28_03_world_335.sql
rename to sql/old/3.3.5a/world/21041_2021_05_14/2021_04_28_03_world_335.sql
diff --git a/sql/updates/world/3.3.5/2021_04_28_04_world_335.sql b/sql/old/3.3.5a/world/21041_2021_05_14/2021_04_28_04_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_04_28_04_world_335.sql
rename to sql/old/3.3.5a/world/21041_2021_05_14/2021_04_28_04_world_335.sql
diff --git a/sql/updates/world/3.3.5/2021_04_28_05_world_335.sql b/sql/old/3.3.5a/world/21041_2021_05_14/2021_04_28_05_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_04_28_05_world_335.sql
rename to sql/old/3.3.5a/world/21041_2021_05_14/2021_04_28_05_world_335.sql
diff --git a/sql/updates/world/3.3.5/2021_04_28_06_world_335.sql b/sql/old/3.3.5a/world/21041_2021_05_14/2021_04_28_06_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_04_28_06_world_335.sql
rename to sql/old/3.3.5a/world/21041_2021_05_14/2021_04_28_06_world_335.sql
diff --git a/sql/updates/world/3.3.5/2021_04_28_07_world.sql b/sql/old/3.3.5a/world/21041_2021_05_14/2021_04_28_07_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_04_28_07_world.sql
rename to sql/old/3.3.5a/world/21041_2021_05_14/2021_04_28_07_world.sql
diff --git a/sql/updates/world/3.3.5/2021_04_28_08_world.sql b/sql/old/3.3.5a/world/21041_2021_05_14/2021_04_28_08_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_04_28_08_world.sql
rename to sql/old/3.3.5a/world/21041_2021_05_14/2021_04_28_08_world.sql
diff --git a/sql/updates/world/3.3.5/2021_04_29_00_world.sql b/sql/old/3.3.5a/world/21041_2021_05_14/2021_04_29_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_04_29_00_world.sql
rename to sql/old/3.3.5a/world/21041_2021_05_14/2021_04_29_00_world.sql
diff --git a/sql/updates/world/3.3.5/2021_05_04_00_world.sql b/sql/old/3.3.5a/world/21041_2021_05_14/2021_05_04_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_05_04_00_world.sql
rename to sql/old/3.3.5a/world/21041_2021_05_14/2021_05_04_00_world.sql
diff --git a/sql/updates/world/3.3.5/2021_05_04_01_world.sql b/sql/old/3.3.5a/world/21041_2021_05_14/2021_05_04_01_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_05_04_01_world.sql
rename to sql/old/3.3.5a/world/21041_2021_05_14/2021_05_04_01_world.sql
diff --git a/sql/updates/world/3.3.5/2021_05_04_02_world.sql b/sql/old/3.3.5a/world/21041_2021_05_14/2021_05_04_02_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_05_04_02_world.sql
rename to sql/old/3.3.5a/world/21041_2021_05_14/2021_05_04_02_world.sql
diff --git a/sql/updates/world/3.3.5/2021_05_04_03_world.sql b/sql/old/3.3.5a/world/21041_2021_05_14/2021_05_04_03_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_05_04_03_world.sql
rename to sql/old/3.3.5a/world/21041_2021_05_14/2021_05_04_03_world.sql
diff --git a/sql/updates/world/3.3.5/2021_05_04_04_world_335.sql b/sql/old/3.3.5a/world/21041_2021_05_14/2021_05_04_04_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_05_04_04_world_335.sql
rename to sql/old/3.3.5a/world/21041_2021_05_14/2021_05_04_04_world_335.sql
diff --git a/sql/updates/world/3.3.5/2021_05_04_05_world_335.sql b/sql/old/3.3.5a/world/21041_2021_05_14/2021_05_04_05_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_05_04_05_world_335.sql
rename to sql/old/3.3.5a/world/21041_2021_05_14/2021_05_04_05_world_335.sql
diff --git a/sql/updates/world/3.3.5/2021_05_04_06_world_335.sql b/sql/old/3.3.5a/world/21041_2021_05_14/2021_05_04_06_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_05_04_06_world_335.sql
rename to sql/old/3.3.5a/world/21041_2021_05_14/2021_05_04_06_world_335.sql
diff --git a/sql/updates/world/3.3.5/2021_05_04_07_world_335.sql b/sql/old/3.3.5a/world/21041_2021_05_14/2021_05_04_07_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_05_04_07_world_335.sql
rename to sql/old/3.3.5a/world/21041_2021_05_14/2021_05_04_07_world_335.sql
diff --git a/sql/updates/world/3.3.5/2021_05_04_08_world_335.sql b/sql/old/3.3.5a/world/21041_2021_05_14/2021_05_04_08_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_05_04_08_world_335.sql
rename to sql/old/3.3.5a/world/21041_2021_05_14/2021_05_04_08_world_335.sql
diff --git a/sql/updates/world/3.3.5/2021_05_06_00_world.sql b/sql/old/3.3.5a/world/21041_2021_05_14/2021_05_06_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_05_06_00_world.sql
rename to sql/old/3.3.5a/world/21041_2021_05_14/2021_05_06_00_world.sql
diff --git a/sql/updates/world/3.3.5/2021_05_07_00_world.sql b/sql/old/3.3.5a/world/21041_2021_05_14/2021_05_07_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_05_07_00_world.sql
rename to sql/old/3.3.5a/world/21041_2021_05_14/2021_05_07_00_world.sql
diff --git a/sql/updates/world/3.3.5/2021_05_07_01_world.sql b/sql/old/3.3.5a/world/21041_2021_05_14/2021_05_07_01_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_05_07_01_world.sql
rename to sql/old/3.3.5a/world/21041_2021_05_14/2021_05_07_01_world.sql
diff --git a/sql/updates/world/3.3.5/2021_05_07_02_world.sql b/sql/old/3.3.5a/world/21041_2021_05_14/2021_05_07_02_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_05_07_02_world.sql
rename to sql/old/3.3.5a/world/21041_2021_05_14/2021_05_07_02_world.sql
diff --git a/sql/updates/world/3.3.5/2021_05_08_00_world.sql b/sql/old/3.3.5a/world/21041_2021_05_14/2021_05_08_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_05_08_00_world.sql
rename to sql/old/3.3.5a/world/21041_2021_05_14/2021_05_08_00_world.sql
diff --git a/sql/updates/world/3.3.5/2021_05_08_01_world_335.sql b/sql/old/3.3.5a/world/21041_2021_05_14/2021_05_08_01_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_05_08_01_world_335.sql
rename to sql/old/3.3.5a/world/21041_2021_05_14/2021_05_08_01_world_335.sql
diff --git a/sql/updates/world/3.3.5/2021_05_08_02_world_335.sql b/sql/old/3.3.5a/world/21041_2021_05_14/2021_05_08_02_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_05_08_02_world_335.sql
rename to sql/old/3.3.5a/world/21041_2021_05_14/2021_05_08_02_world_335.sql
diff --git a/sql/updates/world/3.3.5/2021_05_08_03_world.sql b/sql/old/3.3.5a/world/21041_2021_05_14/2021_05_08_03_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_05_08_03_world.sql
rename to sql/old/3.3.5a/world/21041_2021_05_14/2021_05_08_03_world.sql
diff --git a/sql/updates/world/3.3.5/2021_05_10_00_world.sql b/sql/old/3.3.5a/world/21041_2021_05_14/2021_05_10_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_05_10_00_world.sql
rename to sql/old/3.3.5a/world/21041_2021_05_14/2021_05_10_00_world.sql
diff --git a/sql/updates/world/3.3.5/2021_05_10_01_world_335.sql b/sql/old/3.3.5a/world/21041_2021_05_14/2021_05_10_01_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_05_10_01_world_335.sql
rename to sql/old/3.3.5a/world/21041_2021_05_14/2021_05_10_01_world_335.sql
diff --git a/sql/updates/world/3.3.5/2021_05_13_00_world_335.sql b/sql/old/3.3.5a/world/21041_2021_05_14/2021_05_13_00_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_05_13_00_world_335.sql
rename to sql/old/3.3.5a/world/21041_2021_05_14/2021_05_13_00_world_335.sql
diff --git a/sql/updates/world/3.3.5/2021_05_13_01_world_335.sql b/sql/old/3.3.5a/world/21041_2021_05_14/2021_05_13_01_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_05_13_01_world_335.sql
rename to sql/old/3.3.5a/world/21041_2021_05_14/2021_05_13_01_world_335.sql
diff --git a/sql/updates/world/3.3.5/2021_05_13_02_world_335.sql b/sql/old/3.3.5a/world/21041_2021_05_14/2021_05_13_02_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_05_13_02_world_335.sql
rename to sql/old/3.3.5a/world/21041_2021_05_14/2021_05_13_02_world_335.sql
diff --git a/sql/updates/world/3.3.5/2021_05_13_03_world_335.sql b/sql/old/3.3.5a/world/21041_2021_05_14/2021_05_13_03_world_335.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2021_05_13_03_world_335.sql
rename to sql/old/3.3.5a/world/21041_2021_05_14/2021_05_13_03_world_335.sql
diff --git a/sql/updates/auth/3.3.5/2021_05_14_00_auth.sql b/sql/updates/auth/3.3.5/2021_05_14_00_auth.sql
new file mode 100644
index 00000000000..5026d72fec5
--- /dev/null
+++ b/sql/updates/auth/3.3.5/2021_05_14_00_auth.sql
@@ -0,0 +1,2 @@
+-- TDB 335.21051 auth
+UPDATE `updates` SET `state`='ARCHIVED';
diff --git a/sql/updates/characters/3.3.5/2021_05_14_00_characters.sql b/sql/updates/characters/3.3.5/2021_05_14_00_characters.sql
new file mode 100644
index 00000000000..5ff61a23b90
--- /dev/null
+++ b/sql/updates/characters/3.3.5/2021_05_14_00_characters.sql
@@ -0,0 +1,2 @@
+-- TDB 335.21051 characters
+UPDATE `updates` SET `state`='ARCHIVED';
diff --git a/sql/updates/world/3.3.5/2021_05_14_00_world.sql b/sql/updates/world/3.3.5/2021_05_14_00_world.sql
new file mode 100644
index 00000000000..8c277055e62
--- /dev/null
+++ b/sql/updates/world/3.3.5/2021_05_14_00_world.sql
@@ -0,0 +1,3 @@
+-- TDB 335.21051 world
+UPDATE `version` SET `db_version`='TDB 335.21051', `cache_id`=21051 LIMIT 1;
+UPDATE `updates` SET `state`='ARCHIVED';