diff --git a/sql/base/auth_database.sql b/sql/base/auth_database.sql
index e0a4658d3ad..8cf98f329b4 100644
--- a/sql/base/auth_database.sql
+++ b/sql/base/auth_database.sql
@@ -661,33 +661,33 @@ INSERT INTO `updates` VALUES
 ('2016_01_13_00_auth.sql','24615CC69B3CD7BB4699874647C35BA86E8A93FD','ARCHIVED','2016-01-14 23:27:07',0),
 ('2016_01_13_00_auth_434.sql','3E88183E1A85D11BFD74CF9A32A725C44AE02EEC','ARCHIVED','2016-01-13 01:19:16',0),
 ('2016_03_12_00_auth.sql','0ACDD35EC9745231BCFA701B78056DEF94D0CC53','ARCHIVED','2016-03-12 01:19:16',0),
-('2016_05_15_00_auth_from_335_was_2016_05_11_00_auth.sql','C593DA4423F344FB10AAA86C20D1E87B','ARCHIVED','',0),
-('2016_08_28_00_auth.sql','30A76055F50A79629DB82B7BF17CE9B7','ARCHIVED','',0),
-('2016_09_03_02_auth_from_335_was_2016_06_06_00_auth.sql','8E1989D33A2A6CCC60B3AFAEFCBFD735','ARCHIVED','',0),
-('2016_09_28_00_auth.sql','1719674D3EE9E8B965BAC4042140D6BD','ARCHIVED','',0),
-('2016_11_06_00_auth.sql','C3B848943465F7D360EF3E01F46219E6','ARCHIVED','2016-11-06 17:11:18',0),
-('2017_01_07_00_auth_from_335_was_2017_01_06_00_auth.sql','D471D225E30B746E4A1736D173E83A84','ARCHIVED','2017-01-07 00:00:00',0),
-('2017_01_12_00_auth.sql','7EB5AAEC12EDD728EB66C89FF5E4C466','ARCHIVED','2017-01-12 00:00:00',0),
-('2017_02_11_00_auth.sql','16147413149F2EA1AD413FEA9C503093','ARCHIVED','2017-02-11 00:00:00',0),
-('2017_03_16_00_auth.sql','C1BC73E532180AE4CE5D28AF6A0730DC','ARCHIVED','2017-02-16 00:00:00',0),
-('2017_03_20_00_auth_from_335_was_2017_03_17_00_auth.sql','22FBDB54B8BC809C95E4D2AFAF1B249C','ARCHIVED','2017-03-20 16:48:01',0),
-('2017_04_02_00_auth.sql','2420814101287A57800A877BE699AE5F','ARCHIVED','2017-04-02 07:48:01',0),
-('2017_04_16_00_auth.sql','0E7939DE2187B93E351DE6174D467F0C','ARCHIVED','2017-04-16 07:48:01',0),
-('2017_05_16_00_auth.sql','B6E7FF36B4FE6B0838B769BDE1FC1345','ARCHIVED','2017-05-16 06:48:01',0),
-('2017_05_28_00_auth_from_335_was_2016_09_22_00_auth.sql','B06D9156513BCFD21ADC65C3822B6D78','ARCHIVED','2017-05-28 23:48:01',0),
-('2017_05_30_00_auth.sql','180754FEA2A14377E709A8F9BF732684','ARCHIVED','2017-05-30 09:48:01',0),
-('2017_06_12_00_auth.sql','705E48D40A49A4C65E2E14C47FAE6682','ARCHIVED','2017-05-30 09:48:01',0),
-('2017_06_12_01_auth.sql','D310B30264ED1312328C3A97A8121153','ARCHIVED','2017-05-30 09:48:01',0),
-('2017_06_12_02_auth.sql','64E4AF5447478C30DC40CA21B163076C','ARCHIVED','2017-05-30 09:48:01',0),
-('2017_06_17_00_auth.sql','082C36FADA3159C26CD8C89E202779E7','ARCHIVED','2017-06-17 01:40:04',0),
-('2017_06_18_00_auth.sql','D8042BF7F9B66797F84CB4E224634BD4','ARCHIVED','2017-06-18 01:40:04',0),
-('2017_06_28_00_auth.sql','9611984934CBA07D0BDC0F00C22C6C28','ARCHIVED','2017-06-28 01:40:04',0),
-('2017_07_18_00_auth.sql','2B2C70F3A6D0E798CFBDC77C42F46E23','ARCHIVED','2017-07-18 01:40:04',0),
-('2017_09_17_00_auth.sql','6272BF0749AF8B4F1D7BB27498993670','ARCHIVED','2017-09-17 01:40:04',0),
-('2017_10_14_00_world_from_335_was_2017_10_13_00_auth.sql','7EF0F4E6D8EDD0AA62EB765F6356A21E','ARCHIVED','2017-10-14 01:40:04',0),
-('2017_10_16_00_auth.sql','41543E05464F1AE3AC0FB478AB605B66','ARCHIVED','2017-10-16 01:40:04',0),
-('2017_10_29_00_auth.sql','2B4F28A4CCFA5755B24C5279861A6E6A','ARCHIVED','2017-10-29 01:40:04',0),
-('2017_11_08_00_auth.sql','459035FEBD1C60E77BF3BE38C49C0718','ARCHIVED','2017-11-08 01:40:04',0),
+('2016_05_15_00_auth_from_335_was_2016_05_11_00_auth.sql','95B66235B8D67BF1CA216EB09F313C1F8F393B47','ARCHIVED','',0),
+('2016_08_28_00_auth.sql','FF293BF1F7C182C91E3B1EED2762E645C6BB5C21','ARCHIVED','',0),
+('2016_09_03_02_auth_from_335_was_2016_06_06_00_auth.sql','A0A8D73A952D0618833416513D53F73A70E7EA25','ARCHIVED','',0),
+('2016_09_28_00_auth.sql','A674D335AF50F05234F7F998E8491B2F12D74F65','ARCHIVED','',0),
+('2016_11_06_00_auth.sql','C5FFEF608081CDE4EFF86280E1168A15A608C212','ARCHIVED','2016-11-06 17:11:18',0),
+('2017_01_07_00_auth_from_335_was_2017_01_06_00_auth.sql','6CCFE6A9774EC733C9863D36A0F15F3534189BBD','ARCHIVED','2017-01-07 00:00:00',0),
+('2017_01_12_00_auth.sql','A507AAEF28095DD6375374A55D00D2904D166A68','ARCHIVED','2017-01-12 00:00:00',0),
+('2017_02_11_00_auth.sql','589084B6B63B27D159C8B42DD5CFD387929CD85E','ARCHIVED','2017-02-11 00:00:00',0),
+('2017_03_16_00_auth.sql','620F3EC4FE1172BBC19821BFFB208EBCCFB7AC3D','ARCHIVED','2017-02-16 00:00:00',0),
+('2017_03_20_00_auth_from_335_was_2017_03_17_00_auth.sql','4902E9B1B063F399F928C2DD7AFD60427738E227','ARCHIVED','2017-03-20 16:48:01',0),
+('2017_04_02_00_auth.sql','A01C4CF0D645EADC00AD5F5140D7CE1B24704DD5','ARCHIVED','2017-04-02 07:48:01',0),
+('2017_04_16_00_auth.sql','A695EFD4D7F5392A4A3CA74645E4206B8B5339B3','ARCHIVED','2017-04-16 07:48:01',0),
+('2017_05_16_00_auth.sql','CEB8E63B38447D884E38262D1BE257B6674AA1C8','ARCHIVED','2017-05-16 06:48:01',0),
+('2017_05_28_00_auth_from_335_was_2016_09_22_00_auth.sql','70047954E3556BFA430ADD5680EF8797F74A4B9E','ARCHIVED','2017-05-28 23:48:01',0),
+('2017_05_30_00_auth.sql','280ADDDCE0CD562A846A67940A71E812F80E988C','ARCHIVED','2017-05-30 09:48:01',0),
+('2017_06_12_00_auth.sql','176532AED785F1F759382C79A28E0FED92E99779','ARCHIVED','2017-05-30 09:48:01',0),
+('2017_06_12_01_auth.sql','661B4935E101AF188BEBF43203144104E89F8C54','ARCHIVED','2017-05-30 09:48:01',0),
+('2017_06_12_02_auth.sql','A1A830B5D4FE3497DD6096372E2ADCC5C82AD96A','ARCHIVED','2017-05-30 09:48:01',0),
+('2017_06_17_00_auth.sql','BC260FE62DC51FAD88BD572B59704D3BB1FDEA18','ARCHIVED','2017-06-17 01:40:04',0),
+('2017_06_18_00_auth.sql','A49DADF9B0C45F6567247165D81ED8B20E2FD327','ARCHIVED','2017-06-18 01:40:04',0),
+('2017_06_28_00_auth.sql','D32EF80F57F629C23395D80F06E91D7E40719F83','ARCHIVED','2017-06-28 01:40:04',0),
+('2017_07_18_00_auth.sql','DA5C17CBAE5B11366FB10B571795C86FCD54CC10','ARCHIVED','2017-07-18 01:40:04',0),
+('2017_09_17_00_auth.sql','A014A54EADF92626C044D781941D36DFD9764730','ARCHIVED','2017-09-17 01:40:04',0),
+('2017_10_14_00_world_from_335_was_2017_10_13_00_auth.sql','87674E0D166AC60E3725B445714427892E42C6FE','ARCHIVED','2017-10-14 01:40:04',0),
+('2017_10_16_00_auth.sql','50ABC07082EA6B0578B034BB30EBBCDDDDF7AD45','ARCHIVED','2017-10-16 01:40:04',0),
+('2017_10_29_00_auth.sql','F742569F56BB29CE9C8DBBD40A6AB474F846485C','ARCHIVED','2017-10-29 01:40:04',0),
+('2017_11_08_00_auth.sql','DB37CC4B077D6C2413F4091E48C3382411F59228','ARCHIVED','2017-11-08 01:40:04',0),
 ('2017_11_15_00_auth.sql','BF17A1BAF2C3B5A64AEB4DC9C0E46508AA704129','ARCHIVED','2017-10-16 01:40:04',0);
 /*!40000 ALTER TABLE `updates` ENABLE KEYS */;
 UNLOCK TABLES;
diff --git a/sql/base/characters_database.sql b/sql/base/characters_database.sql
index 39117039f90..b34b91c88ce 100644
--- a/sql/base/characters_database.sql
+++ b/sql/base/characters_database.sql
@@ -2831,22 +2831,22 @@ INSERT INTO `updates` VALUES
 ('2016_02_21_from_335_2016_02_10_00_characters.sql','F1B4DA202819CABC7319A4470A2D224A34609E97','ARCHIVED','2016-02-10 00:00:00',0),
 ('2016_03_12_00_characters.sql','0ACDD35EC9745231BCFA701B78056DEF94D0CC53','ARCHIVED','2016-03-12 00:00:00',0),
 ('2016_07_17_00_characters.sql','41BF94C59FE13A61067E6721092F6187E184F37B', 'ARCHIVED', '2016-07-18 21:05:05',0),
-('2016_08_28_00_characters.sql', '111B0E4A6770A79093CC3CFFB9CE3475', 'ARCHIVED', '2016-08-28 21:05:05',0),
+('2016_08_28_00_characters.sql','36A339D56D03E3782D96C4F883D29B418A12BFC0', 'ARCHIVED', '2016-08-28 21:05:05',0),
 ('2016_09_14_00_characters_from_335_was_2016_09_13_00_characters.sql','27A04615B11B2CFC3A26778F52F74C071E4F9C54','ARCHIVED','2016-07-06 18:55:18',0),
-('2016_09_28_00_characters.sql','18F026197AAF80B9CFB82BE308D7011E','ARCHIVED','2016-09-28 18:55:18',0),
-('2016_11_02_00_characters_from_335_was_2016_10_30_00_characters.sql','ED4A7CB8D560E3DB0CA26E27A9523707','ARCHIVED','2016-11-02 04:30:18',0),
-('2016_11_06_00_characters.sql','D62680982E2AD86CC7CDB8B3B8E45D26','ARCHIVED','2016-11-06 17:11:18',0),
-('2017_01_12_00_characters.sql','C864FD9142682A7FA80DD20247046AC7','ARCHIVED','2017-01-12 00:00:00',0),
-('2017_02_11_00_characters.sql','528E8BF7A489518A251C07CD0A1527D4','ARCHIVED','2017-02-11 00:00:00',0),
-('2017_03_16_00_characters.sql','53A9F270A0BCDA0152326D42FA152F8B','ARCHIVED','2017-03-16 00:00:00',0),
-('2017_04_09_00_characters_from_335_was_2017_04_03_00_characters.sql','E401D35E81CDC38135392C99AABC8A53','ARCHIVED','2017-04-03 00:00:00',0),
-('2017_04_14_00_characters_from_335_was_2017_04_12_01_characters.sql','CDF589A2AE1FB78DF74DC0508B9EB73D','ARCHIVED','2017-04-12 00:00:00',0),
-('2017_04_16_00_characters.sql','715A43380642009D9F36250D35630BD6','ARCHIVED','2017-04-16 00:00:00',0),
-('2017_05_16_00_characters.sql','91C6AABE85F87ED71C997695DC7A2A61','ARCHIVED','2017-05-16 00:00:00',0),
-('2017_06_18_00_characters.sql','6A75F79A7F85B53B67266C275D4D6658','ARCHIVED','2017-06-18 00:00:00',0),
-('2017_07_18_00_characters.sql','1FF001BB65502C472313AEB093D54DBD','ARCHIVED','2017-07-18 00:00:00',0),
-('2017_09_17_00_characters.sql','47C5BB983223F188ED17616D03A983C4','ARCHIVED','2017-09-17 00:00:00',0),
-('2017_10_16_00_characters.sql','BC3C20B027E078EF49871C80A4A5421F','ARCHIVED','2017-10-16 00:00:00',0),
+('2016_09_28_00_characters.sql','8C1FBB13E51A464DA90C1112F72DC2CE3287CCCE','ARCHIVED','2016-09-28 18:55:18',0),
+('2016_11_02_00_characters_from_335_was_2016_10_30_00_characters.sql','7E2D5B226907B5A9AF320797F46E86DC27B7EC90','ARCHIVED','2016-11-02 04:30:18',0),
+('2016_11_06_00_characters.sql','7BFE5C56B5DF35D61EB15DCA05FC4C1548868EE9','ARCHIVED','2016-11-06 17:11:18',0),
+('2017_01_12_00_characters.sql','60ADB435A4D4508B51DC01751C211384ADE68AA0','ARCHIVED','2017-01-12 00:00:00',0),
+('2017_02_11_00_characters.sql','35B4DF02D79ECFEC53387850ED410DCB81FB65B8','ARCHIVED','2017-02-11 00:00:00',0),
+('2017_03_16_00_characters.sql','FB7003E51B57FD60B2121F95959B8EC1214BA59B','ARCHIVED','2017-03-16 00:00:00',0),
+('2017_04_09_00_characters_from_335_was_2017_04_03_00_characters.sql','CB072C56692C9FBF170C4036F15773DD86D368B5','ARCHIVED','2017-04-03 00:00:00',0),
+('2017_04_14_00_characters_from_335_was_2017_04_12_01_characters.sql','5A8A1215E3A2356722F52CD7A64BBE03D21FBEA3','ARCHIVED','2017-04-12 00:00:00',0),
+('2017_04_16_00_characters.sql','50CFDE7538E07CB813C26E4182FEF2B486871625','ARCHIVED','2017-04-16 00:00:00',0),
+('2017_05_16_00_characters.sql','C0F96B13AA6C451A406EE62AEE1D3CACB5E0532B','ARCHIVED','2017-05-16 00:00:00',0),
+('2017_06_18_00_characters.sql','23D2E5EC2ECA17DEB9E00173587A30410814133E','ARCHIVED','2017-06-18 00:00:00',0),
+('2017_07_18_00_characters.sql','6A154A76CEE78212CC072DB57AC4B3D95BEE4390','ARCHIVED','2017-07-18 00:00:00',0),
+('2017_09_17_00_characters.sql','48AF8F4A6A656EF0CCEA406B4AEF71A54A5DA98E','ARCHIVED','2017-09-17 00:00:00',0),
+('2017_10_16_00_characters.sql','74500AFF41A5FB2EEE24B0BFAD750C988136BA6B','ARCHIVED','2017-10-16 00:00:00',0),
 ('2017_11_15_00_characters.sql','22D0C3854EE6D0983CD8C43DF0AC4269386F587C','ARCHIVED','2017-11-15 00:00:00',0);
 /*!40000 ALTER TABLE `updates` ENABLE KEYS */;
 UNLOCK TABLES;
diff --git a/sql/updates/world/4.3.4/2017_11_22_11_world_from_335_was_2017_11_22_00_world.sql b/sql/updates/world/4.3.4/2017_11_22_11_world_from_master_was_2017_11_22_00_world.sql
similarity index 100%
rename from sql/updates/world/4.3.4/2017_11_22_11_world_from_335_was_2017_11_22_00_world.sql
rename to sql/updates/world/4.3.4/2017_11_22_11_world_from_master_was_2017_11_22_00_world.sql
diff --git a/sql/updates/world/3.3.5/2017_11_22_00_world.sql b/sql/updates/world/4.3.4/2017_11_22_12_world_from_335_was_2017_11_22_00_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2017_11_22_00_world.sql
rename to sql/updates/world/4.3.4/2017_11_22_12_world_from_335_was_2017_11_22_00_world.sql
diff --git a/sql/updates/world/3.3.5/2017_11_22_01_world.sql b/sql/updates/world/4.3.4/2017_11_22_13_world_from_335_was_2017_11_22_01_world.sql
similarity index 100%
rename from sql/updates/world/3.3.5/2017_11_22_01_world.sql
rename to sql/updates/world/4.3.4/2017_11_22_13_world_from_335_was_2017_11_22_01_world.sql