591 files changed, 561 insertions, 123 deletions

diff --git a/revision_data.h.in.cmake b/revision_data.h.in.cmake
index 699a5ffeb21..5dc0a9a503c 100644
--- a/revision_data.h.in.cmake
+++ b/revision_data.h.in.cmake
@@ -7,8 +7,8 @@
  #define _SOURCE_DIRECTORY          R"(@CMAKE_SOURCE_DIR@)"
  #define _BUILD_DIRECTORY           R"(@BUILDDIR@)"
  #define _MYSQL_EXECUTABLE          R"(@MYSQL_EXECUTABLE@)"
- #define _FULL_DATABASE             "TDB_world_703.00_2016_10_17.sql"
- #define _HOTFIXES_DATABASE         "TDB_hotfixes_703.00_2016_10_17.sql"
+ #define _FULL_DATABASE             "TDB_world_720.00_2017_04_18.sql"
+ #define _HOTFIXES_DATABASE         "TDB_hotfixes_720.00_2017_04_18.sql"
  #define VER_COMPANYNAME_STR        "TrinityCore Developers"
  #define VER_LEGALCOPYRIGHT_STR     "(c)2008-2017 TrinityCore"
  #define VER_FILEVERSION            0,0,0
diff --git a/sql/base/auth_database.sql b/sql/base/auth_database.sql
index 63c497e0a23..bd0ccc8c5eb 100644
--- a/sql/base/auth_database.sql
+++ b/sql/base/auth_database.sql
@@ -757,7 +757,7 @@ CREATE TABLE `updates` (
 
 LOCK TABLES `updates` WRITE;
 /*!40000 ALTER TABLE `updates` DISABLE KEYS */;
-INSERT INTO `updates` VALUES ('2014_10_04_00_auth.sql','C3BC70A6EC381474B7308F442346F1E721176BC6','ARCHIVED','2015-03-21 16:55:52',0),('2014_10_19_00_auth.sql','7472B490A4F86C9D3DA609CDD3197499CB80C87C','ARCHIVED','2015-03-21 16:55:52',0),('2014_10_26_00_auth.sql','75CC67ADE2A3B2E54FD57D6B0DCAA8FE50F4EE35','ARCHIVED','2015-03-21 16:55:52',0),('2014_11_03_00_auth.sql','5948C9F286CF0FEA8E241785C0259FF36B73BDC5','ARCHIVED','2015-03-21 16:55:52',0),('2014_11_04_00_auth.sql','3AFC68B2375C2A417DDEA94583C53AFF83DE50DF','ARCHIVED','2015-03-21 16:55:52',0),('2014_11_09_00_auth.sql','B8DD1A7047C0FDDB80344B239343EC33BF1A0D97','ARCHIVED','2015-03-21 16:55:52',0),('2014_11_10_00_auth.sql','8FBA737A1D3FF4631A1E662A5B500A8BD304EC63','ARCHIVED','2015-03-21 16:55:52',0),('2014_11_10_00_auth_from_335.sql','0E3CB119442D09DD88E967015319BBC8DAFBBFE0','ARCHIVED','2015-03-21 16:55:52',0),('2014_11_10_01_auth.sql','327E77A1DA3546D5275AB249915DD57EDD6FDD3D','ARCHIVED','2015-03-21 16:55:52',0),('2014_11_23_00_auth.sql','0BBEB3EB3AED0FEF277A062819B6B2C00084A742','ARCHIVED','2015-03-21 16:55:52',0),('2014_11_25_00_auth.sql','4F45CDB26BDBB3EE83F1988E3D7818C5926ADC02','ARCHIVED','2015-03-21 16:55:52',0),('2014_12_05_00_auth.sql','6A7BBCEF43111C73A2D2C3CCB6911BE50DE7DD94','ARCHIVED','2015-03-21 16:55:52',0),('2014_12_10_00_auth.sql','821703A96D80F9080074852B5A46E2909C9562EA','ARCHIVED','2015-03-21 16:55:52',0),('2014_12_19_00_auth.sql','44D8E12FFF327AD07878FBDF8D9C16B6B7DCB122','ARCHIVED','2015-03-21 16:55:52',0),('2014_12_20_00_auth.sql','4DAA02AE285C02AE6C82EA2C8B97AC71990F1085','ARCHIVED','2015-03-21 16:55:52',0),('2014_12_25_00_auth.sql','61411930F482BC73FC7FD2C370C811E944F5FF92','ARCHIVED','2015-03-21 16:55:52',0),('2014_12_27_00_auth.sql','CE2E5D2CD82E79C25294539ADED27A1429105B43','ARCHIVED','2015-03-21 16:55:52',0),('2014_12_28_00_auth.sql','0A913217610E76AFF119C27259737BBC523090E6','ARCHIVED','2015-03-21 16:55:52',0),('2015_02_22_00_auth.sql','21CCCF8B01252E16CA3D6C9E3E8DAA4C9B28ED6E','ARCHIVED','2015-03-21 16:55:52',0),('2015_03_01_00_auth.sql','911881E273207FF6182D1FDAC8C85FFAE8F1C852','ARCHIVED','2015-03-21 16:55:52',0),('2015_03_10_00_auth.sql','2CC8502C11412EFEB5C11BE166761A8754A59009','ARCHIVED','2015-03-21 16:55:52',0),('2015_03_20_00_auth.sql','B761760804EA73BD297F296C5C1919687DF7191C','ARCHIVED','2015-03-21 16:55:52',0),('2015_03_20_01_auth.sql','5CCEDF20C8189FB1E8DF064A9F0DDC342841FBF0','ARCHIVED','2015-03-21 16:55:52',0),('2015_03_20_02_auth.sql','85E4ACD9AA099C0C4AC034575F2BB07D348EAC72','ARCHIVED','2015-03-21 16:56:46',0),('2015_03_15_00_auth.sql','1D8E107FBEFE5E7F47E09F45240DFF499B77CDED','ARCHIVED','2015-05-02 13:57:57',0),('2015_03_26_00_auth.sql','34AC8543E6A9C6C832DE58EAB33618EEEF70B9F9','ARCHIVED','2015-05-02 13:57:57',0),('2015_04_04_00_auth.sql','57146B35E54A2EC7869C945034AB078358020311','ARCHIVED','2015-05-02 13:57:57',0),('2015_04_06_00_auth.sql','2A8049DC2923420A002D42FB6F02C2FFCC5CDD22','ARCHIVED','2015-05-02 13:57:57',0),('2015_04_08_00_auth.sql','4D7D8EEF285C982BB676836602266501BEC26764','ARCHIVED','2015-05-02 13:57:57',0),('2015_04_10_00_auth.sql','4AE68FD97A95CEE5143EA20FD33F5D557367AC1F','ARCHIVED','2015-05-02 13:57:57',0),('2015_04_11_00_auth.sql','80A71C8921CFEBB547D264558B6DE27201685B84','ARCHIVED','2015-05-02 13:57:57',0),('2015_04_11_01_auth.sql','3E88183E1A85D11BFD74CF9A32A725C44AE02EEC','ARCHIVED','2015-05-02 13:57:57',0),('2015_04_21_00_auth.sql','1B3B48DBA06368B985C548D166C515C9DD598CB9','ARCHIVED','2015-05-02 13:57:57',0),('2015_05_02_00_auth.sql','96AB595E0D2A088750E3F48B0AF0A8A14F3CFE1E','ARCHIVED','2015-05-02 13:57:57',0),('2015_05_02_01_auth.sql','FB11FB834E488B0FD3AFDABCC1A3113092E7C2E5','ARCHIVED','2015-05-02 13:57:57',0),('2015_07_02_00_auth.sql','E5EE3842AB9B01851E49B360FBAF6FFEEAB2A8DA','ARCHIVED','2015-07-10 19:30:56',0),('2015_07_06_00_auth.sql','6D1ADBA496DC6E6D7B3BF887DA8D4D17D3FBACE0','ARCHIVED','2015-07-10 19:30:56',0),('2015_07_08_00_auth.sql','CB54020AFD1E31742FD8BF9CE16879625E289788','ARCHIVED','2015-07-10 19:30:56',0),('2015_07_08_01_auth.sql','74D281CB82E0DA36D628BDC7AC797AE5498DB461','ARCHIVED','2015-07-10 19:30:56',0),('2015_07_16_00_auth.sql','A057E95B5553B6A57A1642FE3FEC8E2E62EDE3C6','ARCHIVED','2015-10-10 08:30:48',0),('2015_07_29_00_auth.sql','0000FECBC413E96C7C45F303D162E263EFBA7116','ARCHIVED','2015-10-10 08:30:48',0),('2015_08_26_00_auth.sql','3071C02A2EB7DCBF4CEE10279FEFAB7C29A43A3A','ARCHIVED','2015-10-10 08:30:48',0),('2015_09_05_00_auth.sql','F765D82B37873FA67447347D5B83C99C159FB452','ARCHIVED','2015-10-10 08:30:48',0),('2015_09_05_01_auth.sql','97A72DBCBF14D27A1863834A22296905FF276086','ARCHIVED','2015-10-10 08:30:48',0),('2015_09_09_00_auth.sql','495A0CF1B1C49205D4A5D3C25A4E1EB95616D6B4','ARCHIVED','2015-10-10 08:30:48',0),('2015_09_15_00_auth.sql','D1FEFDA4C98F30384DF4B64D5A53187303EB5786','ARCHIVED','2015-10-10 08:30:48',0),('2015_10_09_00_auth.sql','B6D643D444C6AE711503F73B96B6252A852913D6','ARCHIVED','2015-10-10 08:30:48',0),('2015_10_16_00_auth.sql','366AFFD1088762866091A81CE1EC64138B8B35F1','ARCHIVED','2015-11-08 00:46:02',62),('2015_10_17_00_auth.sql','AC0D45E905033F42093852D2C4476663BDACCB3D','ARCHIVED','2015-10-17 12:39:12',0),('2015_11_01_00_auth_2015_08_21_00.sql','C31A9E1D28E11B60BE8F8198637DD51F6D75123F','ARCHIVED','2015-11-01 14:50:26',0),('2015_11_08_00_auth.sql','0ACDD35EC9745231BCFA701B78056DEF94D0CC53','ARCHIVED','2015-11-08 00:51:45',0),('2015_11_21_00_auth.sql','575A1D697CC6C7C517F7CCB950988267C99CE7FA','ARCHIVED','2015-11-21 21:25:38',0),('2015_12_07_00_auth.sql','24A07AC1F38E5D26A3599FC06D29E267418F69F3','ARCHIVED','2015-12-07 20:55:48',0),('2016_01_13_00_auth.sql','114527BCCB0DE286CBE6FDA3029DD0523D1037FA','ARCHIVED','2016-01-13 21:39:13',0),('2016_03_22_01_auth_2016_01_13_00_auth.sql','24615CC69B3CD7BB4699874647C35BA86E8A93FD','ARCHIVED','2016-03-22 22:55:13',0),('2016_03_28_00_auth.sql','BA14D23D81FA24565F04A359090DE86C5E195209','ARCHIVED','2016-03-28 16:49:32',0),('2016_04_11_00_auth.sql','0ACDD35EC9745231BCFA701B78056DEF94D0CC53','ARCHIVED','2016-04-11 02:24:14',30),('2016_04_17_00_auth.sql','83399B64D1221B56F73A0FFB51889F11A70521BC','ARCHIVED','2016-04-17 00:22:05',0),('2016_05_07_00_auth.sql','7E36DCC4F06FCDCDA7155AF3C5EDF8D3A720565F','ARCHIVED','2016-05-07 01:00:21',0),('2016_05_19_00_auth.sql','FB52E6BF35682CE6FA667B552B551F4FBD72AC30','ARCHIVED','2016-05-19 22:18:06',0),('2016_07_19_00_auth.sql','D5498F28A1E21F4AD0E0D7C2B96FCF7292C14C4D','ARCHIVED','2016-07-19 14:00:28',0),('2016_07_19_01_auth.sql','EBFE5D7D7E7CFA0CDA76AC49A1E8D4FA461A12BE','ARCHIVED','2016-07-19 16:06:39',0),('2016_07_23_00_auth.sql','1048F6A922ACD9BFC2E4518A71AF7037F79A85C4','ARCHIVED','2016-07-23 14:39:21',0),('2016_07_23_01_auth.sql','5897C7D8B8DE15895286FBCD1535FC75E1B70F62','ARCHIVED','2016-07-23 17:35:11',0),('2016_07_30_00_auth.sql','0FD4147840F7F02E2F1828A904B269F5B66097E0','ARCHIVED','2016-07-30 15:07:02',0),('2016_08_07_00_auth.sql','D9DD23851822E32E1312FFABEE2DB721C8651443','ARCHIVED','2016-08-07 15:33:42',0),('2016_08_11_00_auth.sql','0C79A86A4DFC53746BECF3D8A145482F94AE5FC9','ARCHIVED','2016-08-11 17:02:20',0),('2016_08_13_00_auth.sql','ED2286C4FF3D80D0F4DEE3D3121BCC15544470BE','ARCHIVED','2016-08-13 01:11:49',0),('2016_08_26_00_auth.sql','3C566371B6026EFEEA19CD215EC9F02C6DA9EAB3','ARCHIVED','2016-08-26 14:09:52',19),('2016_08_27_00_auth.sql','65ABEF7ACBCEA974C744ED42F95FBBD29226917B','ARCHIVED','2016-08-27 07:02:45',0),('2016_08_30_00_auth.sql','E16C19A938FE6370921658D2B713EE28A633FD56','ARCHIVED','2016-08-30 00:00:00',0),('2016_09_02_00_auth.sql','08932DAC4BDE74D3C39A43DDE404522F23EDD035','ARCHIVED','2016-09-02 00:00:00',0),('2016_09_03_00_auth_2016_05_11_00_auth.sql','401EFD3586772BDED66B4A944C20A1AC18A22D3A','ARCHIVED','2016-09-03 11:29:38',0),('2016_09_03_01_auth.sql','08B5ABCB74BBF25A30D37AF639F0EA1B10640673','ARCHIVED','2016-09-03 13:24:32',0),('2016_09_03_02_auth_2016_06_06_00_auth.sql','A0A8D73A952D0618833416513D53F73A70E7EA25','ARCHIVED','2016-09-03 15:56:50',0),('2016_09_03_03_auth.sql','9BF1C03EE39B6DC7E817BA46BE7D12A41AFBFDF7','ARCHIVED','2016-09-03 15:56:50',0),('2016_09_15_00_auth.sql','CD65F822AF1B5B7776E39804D0362F3E34AA6445','ARCHIVED','2016-09-15 16:30:36',0),('2016_09_21_00_auth.sql','57219A16B88080240EED94CDD41FC2764B8A32C5','ARCHIVED','2016-09-21 17:08:43',0),('2016_09_25_00_auth.sql','E811EFD8CE92ABEC5B8C02A09E643035939CF96D','ARCHIVED','2016-09-25 15:56:58',0),('2016_10_01_00_auth.sql','7C444FF1B03BA3C83472BDA409854754D052D6FB','ARCHIVED','2016-10-01 13:32:43',0),('2016_10_06_00_auth.sql','6A415F9813EFB5B95EB2AA2B326E1A6791E25EDB','ARCHIVED','2016-10-06 23:16:24',0),('2016_10_12_00_auth.sql','671D57BBA183AC70B9580DEE19B7EC046AF2EA87','ARCHIVED','2016-10-12 00:01:05',0),('2016_10_17_00_auth.sql','A0EF594CD73690D46A46031137DB0E895F079235','RELEASED','2016-10-16 16:33:05',19),('2016_10_25_00_auth.sql','5743FB1AC3F564FE4192DCFA90260BAD5E501882','RELEASED','2016-10-25 19:27:02',0),('2016_10_28_00_auth.sql','C1B9B1DD20B2183C6CB44CAED9B91BA7C63B8C49','RELEASED','2016-10-28 00:07:48',0),('2016_11_04_00_auth.sql','3F4FE06DCE019EB3223B5A6E0F80E2239078967F','RELEASED','2016-11-04 20:25:23',0),('2016_11_09_00_auth.sql','56432F8AEC2943A398A5B8B77843138B5B704257','RELEASED','2016-11-09 18:46:48',0),('2016_11_17_00_auth.sql','18E8F8FC93CC38755AB571638960AAFB98C0F3F1','RELEASED','2016-11-17 23:47:51',0),('2016_12_04_00_auth.sql','B1623681EAB651D2A091E3F4D4D4E476CF6D3AEA','RELEASED','2016-12-04 00:41:36',0),('2016_12_11_00_auth.sql','24CA34537DB697962DDD69EEE4BB5E79D2A573DA','RELEASED','2016-12-11 18:18:59',0),('2016_12_18_00_auth.sql','7AB53E033680CF7439F142EF83CD13E6F5D0ACB9','RELEASED','2016-12-18 12:15:48',0),('2017_01_14_00_auth.sql','1B514D1364042DB4CE68929EB54A94F86983441D','RELEASED','2017-01-14 20:50:47',0),('2017_01_26_00_auth.sql','723E1B69981A32A2F28A67C64902BA1AE7E98E48','RELEASED','2017-01-26 17:10:15',0),('2017_01_29_00_auth.sql','B76C514678903F540302505AF66886F7D2C89E30','RELEASED','2017-01-29 00:00:00',0),('2017_03_11_00_auth.sql','2F2F67E51439346B212C27B7224E4614C00E1AEB','RELEASED','2017-03-11 00:00:00',0),('2017_03_17_00_auth.sql','4902E9B1B063F399F928C2DD7AFD60427738E227','RELEASED','2017-03-17 18:58:01',0),('2017_04_17_00_auth.sql','86299FAB21D895E84272286309CC8EE80F9DA8C7','RELEASED','2017-04-17 00:00:00',0);
+INSERT INTO `updates` VALUES ('2014_10_04_00_auth.sql','C3BC70A6EC381474B7308F442346F1E721176BC6','ARCHIVED','2015-03-21 16:55:52',0),('2014_10_19_00_auth.sql','7472B490A4F86C9D3DA609CDD3197499CB80C87C','ARCHIVED','2015-03-21 16:55:52',0),('2014_10_26_00_auth.sql','75CC67ADE2A3B2E54FD57D6B0DCAA8FE50F4EE35','ARCHIVED','2015-03-21 16:55:52',0),('2014_11_03_00_auth.sql','5948C9F286CF0FEA8E241785C0259FF36B73BDC5','ARCHIVED','2015-03-21 16:55:52',0),('2014_11_04_00_auth.sql','3AFC68B2375C2A417DDEA94583C53AFF83DE50DF','ARCHIVED','2015-03-21 16:55:52',0),('2014_11_09_00_auth.sql','B8DD1A7047C0FDDB80344B239343EC33BF1A0D97','ARCHIVED','2015-03-21 16:55:52',0),('2014_11_10_00_auth.sql','8FBA737A1D3FF4631A1E662A5B500A8BD304EC63','ARCHIVED','2015-03-21 16:55:52',0),('2014_11_10_00_auth_from_335.sql','0E3CB119442D09DD88E967015319BBC8DAFBBFE0','ARCHIVED','2015-03-21 16:55:52',0),('2014_11_10_01_auth.sql','327E77A1DA3546D5275AB249915DD57EDD6FDD3D','ARCHIVED','2015-03-21 16:55:52',0),('2014_11_23_00_auth.sql','0BBEB3EB3AED0FEF277A062819B6B2C00084A742','ARCHIVED','2015-03-21 16:55:52',0),('2014_11_25_00_auth.sql','4F45CDB26BDBB3EE83F1988E3D7818C5926ADC02','ARCHIVED','2015-03-21 16:55:52',0),('2014_12_05_00_auth.sql','6A7BBCEF43111C73A2D2C3CCB6911BE50DE7DD94','ARCHIVED','2015-03-21 16:55:52',0),('2014_12_10_00_auth.sql','821703A96D80F9080074852B5A46E2909C9562EA','ARCHIVED','2015-03-21 16:55:52',0),('2014_12_19_00_auth.sql','44D8E12FFF327AD07878FBDF8D9C16B6B7DCB122','ARCHIVED','2015-03-21 16:55:52',0),('2014_12_20_00_auth.sql','4DAA02AE285C02AE6C82EA2C8B97AC71990F1085','ARCHIVED','2015-03-21 16:55:52',0),('2014_12_25_00_auth.sql','61411930F482BC73FC7FD2C370C811E944F5FF92','ARCHIVED','2015-03-21 16:55:52',0),('2014_12_27_00_auth.sql','CE2E5D2CD82E79C25294539ADED27A1429105B43','ARCHIVED','2015-03-21 16:55:52',0),('2014_12_28_00_auth.sql','0A913217610E76AFF119C27259737BBC523090E6','ARCHIVED','2015-03-21 16:55:52',0),('2015_02_22_00_auth.sql','21CCCF8B01252E16CA3D6C9E3E8DAA4C9B28ED6E','ARCHIVED','2015-03-21 16:55:52',0),('2015_03_01_00_auth.sql','911881E273207FF6182D1FDAC8C85FFAE8F1C852','ARCHIVED','2015-03-21 16:55:52',0),('2015_03_10_00_auth.sql','2CC8502C11412EFEB5C11BE166761A8754A59009','ARCHIVED','2015-03-21 16:55:52',0),('2015_03_20_00_auth.sql','B761760804EA73BD297F296C5C1919687DF7191C','ARCHIVED','2015-03-21 16:55:52',0),('2015_03_20_01_auth.sql','5CCEDF20C8189FB1E8DF064A9F0DDC342841FBF0','ARCHIVED','2015-03-21 16:55:52',0),('2015_03_20_02_auth.sql','85E4ACD9AA099C0C4AC034575F2BB07D348EAC72','ARCHIVED','2015-03-21 16:56:46',0),('2015_03_15_00_auth.sql','1D8E107FBEFE5E7F47E09F45240DFF499B77CDED','ARCHIVED','2015-05-02 13:57:57',0),('2015_03_26_00_auth.sql','34AC8543E6A9C6C832DE58EAB33618EEEF70B9F9','ARCHIVED','2015-05-02 13:57:57',0),('2015_04_04_00_auth.sql','57146B35E54A2EC7869C945034AB078358020311','ARCHIVED','2015-05-02 13:57:57',0),('2015_04_06_00_auth.sql','2A8049DC2923420A002D42FB6F02C2FFCC5CDD22','ARCHIVED','2015-05-02 13:57:57',0),('2015_04_08_00_auth.sql','4D7D8EEF285C982BB676836602266501BEC26764','ARCHIVED','2015-05-02 13:57:57',0),('2015_04_10_00_auth.sql','4AE68FD97A95CEE5143EA20FD33F5D557367AC1F','ARCHIVED','2015-05-02 13:57:57',0),('2015_04_11_00_auth.sql','80A71C8921CFEBB547D264558B6DE27201685B84','ARCHIVED','2015-05-02 13:57:57',0),('2015_04_11_01_auth.sql','3E88183E1A85D11BFD74CF9A32A725C44AE02EEC','ARCHIVED','2015-05-02 13:57:57',0),('2015_04_21_00_auth.sql','1B3B48DBA06368B985C548D166C515C9DD598CB9','ARCHIVED','2015-05-02 13:57:57',0),('2015_05_02_00_auth.sql','96AB595E0D2A088750E3F48B0AF0A8A14F3CFE1E','ARCHIVED','2015-05-02 13:57:57',0),('2015_05_02_01_auth.sql','FB11FB834E488B0FD3AFDABCC1A3113092E7C2E5','ARCHIVED','2015-05-02 13:57:57',0),('2015_07_02_00_auth.sql','E5EE3842AB9B01851E49B360FBAF6FFEEAB2A8DA','ARCHIVED','2015-07-10 19:30:56',0),('2015_07_06_00_auth.sql','6D1ADBA496DC6E6D7B3BF887DA8D4D17D3FBACE0','ARCHIVED','2015-07-10 19:30:56',0),('2015_07_08_00_auth.sql','CB54020AFD1E31742FD8BF9CE16879625E289788','ARCHIVED','2015-07-10 19:30:56',0),('2015_07_08_01_auth.sql','74D281CB82E0DA36D628BDC7AC797AE5498DB461','ARCHIVED','2015-07-10 19:30:56',0),('2015_07_16_00_auth.sql','A057E95B5553B6A57A1642FE3FEC8E2E62EDE3C6','ARCHIVED','2015-10-10 08:30:48',0),('2015_07_29_00_auth.sql','0000FECBC413E96C7C45F303D162E263EFBA7116','ARCHIVED','2015-10-10 08:30:48',0),('2015_08_26_00_auth.sql','3071C02A2EB7DCBF4CEE10279FEFAB7C29A43A3A','ARCHIVED','2015-10-10 08:30:48',0),('2015_09_05_00_auth.sql','F765D82B37873FA67447347D5B83C99C159FB452','ARCHIVED','2015-10-10 08:30:48',0),('2015_09_05_01_auth.sql','97A72DBCBF14D27A1863834A22296905FF276086','ARCHIVED','2015-10-10 08:30:48',0),('2015_09_09_00_auth.sql','495A0CF1B1C49205D4A5D3C25A4E1EB95616D6B4','ARCHIVED','2015-10-10 08:30:48',0),('2015_09_15_00_auth.sql','D1FEFDA4C98F30384DF4B64D5A53187303EB5786','ARCHIVED','2015-10-10 08:30:48',0),('2015_10_09_00_auth.sql','B6D643D444C6AE711503F73B96B6252A852913D6','ARCHIVED','2015-10-10 08:30:48',0),('2015_10_16_00_auth.sql','366AFFD1088762866091A81CE1EC64138B8B35F1','ARCHIVED','2015-11-08 00:46:02',62),('2015_10_17_00_auth.sql','AC0D45E905033F42093852D2C4476663BDACCB3D','ARCHIVED','2015-10-17 12:39:12',0),('2015_11_01_00_auth_2015_08_21_00.sql','C31A9E1D28E11B60BE8F8198637DD51F6D75123F','ARCHIVED','2015-11-01 14:50:26',0),('2015_11_08_00_auth.sql','0ACDD35EC9745231BCFA701B78056DEF94D0CC53','ARCHIVED','2015-11-08 00:51:45',0),('2015_11_21_00_auth.sql','575A1D697CC6C7C517F7CCB950988267C99CE7FA','ARCHIVED','2015-11-21 21:25:38',0),('2015_12_07_00_auth.sql','24A07AC1F38E5D26A3599FC06D29E267418F69F3','ARCHIVED','2015-12-07 20:55:48',0),('2016_01_13_00_auth.sql','114527BCCB0DE286CBE6FDA3029DD0523D1037FA','ARCHIVED','2016-01-13 21:39:13',0),('2016_03_22_01_auth_2016_01_13_00_auth.sql','24615CC69B3CD7BB4699874647C35BA86E8A93FD','ARCHIVED','2016-03-22 22:55:13',0),('2016_03_28_00_auth.sql','BA14D23D81FA24565F04A359090DE86C5E195209','ARCHIVED','2016-03-28 16:49:32',0),('2016_04_11_00_auth.sql','0ACDD35EC9745231BCFA701B78056DEF94D0CC53','ARCHIVED','2016-04-11 02:24:14',30),('2016_04_17_00_auth.sql','83399B64D1221B56F73A0FFB51889F11A70521BC','ARCHIVED','2016-04-17 00:22:05',0),('2016_05_07_00_auth.sql','7E36DCC4F06FCDCDA7155AF3C5EDF8D3A720565F','ARCHIVED','2016-05-07 01:00:21',0),('2016_05_19_00_auth.sql','FB52E6BF35682CE6FA667B552B551F4FBD72AC30','ARCHIVED','2016-05-19 22:18:06',0),('2016_07_19_00_auth.sql','D5498F28A1E21F4AD0E0D7C2B96FCF7292C14C4D','ARCHIVED','2016-07-19 14:00:28',0),('2016_07_19_01_auth.sql','EBFE5D7D7E7CFA0CDA76AC49A1E8D4FA461A12BE','ARCHIVED','2016-07-19 16:06:39',0),('2016_07_23_00_auth.sql','1048F6A922ACD9BFC2E4518A71AF7037F79A85C4','ARCHIVED','2016-07-23 14:39:21',0),('2016_07_23_01_auth.sql','5897C7D8B8DE15895286FBCD1535FC75E1B70F62','ARCHIVED','2016-07-23 17:35:11',0),('2016_07_30_00_auth.sql','0FD4147840F7F02E2F1828A904B269F5B66097E0','ARCHIVED','2016-07-30 15:07:02',0),('2016_08_07_00_auth.sql','D9DD23851822E32E1312FFABEE2DB721C8651443','ARCHIVED','2016-08-07 15:33:42',0),('2016_08_11_00_auth.sql','0C79A86A4DFC53746BECF3D8A145482F94AE5FC9','ARCHIVED','2016-08-11 17:02:20',0),('2016_08_13_00_auth.sql','ED2286C4FF3D80D0F4DEE3D3121BCC15544470BE','ARCHIVED','2016-08-13 01:11:49',0),('2016_08_26_00_auth.sql','3C566371B6026EFEEA19CD215EC9F02C6DA9EAB3','ARCHIVED','2016-08-26 14:09:52',19),('2016_08_27_00_auth.sql','65ABEF7ACBCEA974C744ED42F95FBBD29226917B','ARCHIVED','2016-08-27 07:02:45',0),('2016_08_30_00_auth.sql','E16C19A938FE6370921658D2B713EE28A633FD56','ARCHIVED','2016-08-30 00:00:00',0),('2016_09_02_00_auth.sql','08932DAC4BDE74D3C39A43DDE404522F23EDD035','ARCHIVED','2016-09-02 00:00:00',0),('2016_09_03_00_auth_2016_05_11_00_auth.sql','401EFD3586772BDED66B4A944C20A1AC18A22D3A','ARCHIVED','2016-09-03 11:29:38',0),('2016_09_03_01_auth.sql','08B5ABCB74BBF25A30D37AF639F0EA1B10640673','ARCHIVED','2016-09-03 13:24:32',0),('2016_09_03_02_auth_2016_06_06_00_auth.sql','A0A8D73A952D0618833416513D53F73A70E7EA25','ARCHIVED','2016-09-03 15:56:50',0),('2016_09_03_03_auth.sql','9BF1C03EE39B6DC7E817BA46BE7D12A41AFBFDF7','ARCHIVED','2016-09-03 15:56:50',0),('2016_09_15_00_auth.sql','CD65F822AF1B5B7776E39804D0362F3E34AA6445','ARCHIVED','2016-09-15 16:30:36',0),('2016_09_21_00_auth.sql','57219A16B88080240EED94CDD41FC2764B8A32C5','ARCHIVED','2016-09-21 17:08:43',0),('2016_09_25_00_auth.sql','E811EFD8CE92ABEC5B8C02A09E643035939CF96D','ARCHIVED','2016-09-25 15:56:58',0),('2016_10_01_00_auth.sql','7C444FF1B03BA3C83472BDA409854754D052D6FB','ARCHIVED','2016-10-01 13:32:43',0),('2016_10_06_00_auth.sql','6A415F9813EFB5B95EB2AA2B326E1A6791E25EDB','ARCHIVED','2016-10-06 23:16:24',0),('2016_10_12_00_auth.sql','671D57BBA183AC70B9580DEE19B7EC046AF2EA87','ARCHIVED','2016-10-12 00:01:05',0),('2016_10_17_00_auth.sql','A0EF594CD73690D46A46031137DB0E895F079235','ARCHIVED','2016-10-16 16:33:05',19),('2016_10_25_00_auth.sql','5743FB1AC3F564FE4192DCFA90260BAD5E501882','ARCHIVED','2016-10-25 19:27:02',0),('2016_10_28_00_auth.sql','C1B9B1DD20B2183C6CB44CAED9B91BA7C63B8C49','ARCHIVED','2016-10-28 00:07:48',0),('2016_11_04_00_auth.sql','3F4FE06DCE019EB3223B5A6E0F80E2239078967F','ARCHIVED','2016-11-04 20:25:23',0),('2016_11_09_00_auth.sql','56432F8AEC2943A398A5B8B77843138B5B704257','ARCHIVED','2016-11-09 18:46:48',0),('2016_11_17_00_auth.sql','18E8F8FC93CC38755AB571638960AAFB98C0F3F1','ARCHIVED','2016-11-17 23:47:51',0),('2016_12_04_00_auth.sql','B1623681EAB651D2A091E3F4D4D4E476CF6D3AEA','ARCHIVED','2016-12-04 00:41:36',0),('2016_12_11_00_auth.sql','24CA34537DB697962DDD69EEE4BB5E79D2A573DA','ARCHIVED','2016-12-11 18:18:59',0),('2016_12_18_00_auth.sql','7AB53E033680CF7439F142EF83CD13E6F5D0ACB9','ARCHIVED','2016-12-18 12:15:48',0),('2017_01_14_00_auth.sql','1B514D1364042DB4CE68929EB54A94F86983441D','ARCHIVED','2017-01-14 20:50:47',0),('2017_01_26_00_auth.sql','723E1B69981A32A2F28A67C64902BA1AE7E98E48','ARCHIVED','2017-01-26 17:10:15',0),('2017_01_29_00_auth.sql','B76C514678903F540302505AF66886F7D2C89E30','ARCHIVED','2017-01-29 00:00:00',0),('2017_03_11_00_auth.sql','2F2F67E51439346B212C27B7224E4614C00E1AEB','ARCHIVED','2017-03-11 00:00:00',0),('2017_03_17_00_auth.sql','4902E9B1B063F399F928C2DD7AFD60427738E227','ARCHIVED','2017-03-17 18:58:01',0),('2017_04_17_00_auth.sql','86299FAB21D895E84272286309CC8EE80F9DA8C7','ARCHIVED','2017-04-17 00:00:00',0),('2017_04_19_00_auth.sql','9903AAF50DF384F52E81F7E2892FE5271E000490','RELEASED','2017-04-18 23:16:18',32);
 /*!40000 ALTER TABLE `updates` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -781,7 +781,7 @@ CREATE TABLE `updates_include` (
 
 LOCK TABLES `updates_include` WRITE;
 /*!40000 ALTER TABLE `updates_include` DISABLE KEYS */;
-INSERT INTO `updates_include` VALUES ('$/sql/updates/auth','RELEASED'),('$/sql/custom/auth','RELEASED'),('$/sql/old/6.x/auth','ARCHIVED');
+INSERT INTO `updates_include` VALUES ('$/sql/updates/auth','RELEASED'),('$/sql/custom/auth','RELEASED'),('$/sql/old/6.x/auth','ARCHIVED'),('$/sql/old/7/auth','ARCHIVED');
 /*!40000 ALTER TABLE `updates_include` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -820,4 +820,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2016-10-16 17:35:47
+-- Dump completed on 2017-04-19  0:17:38
diff --git a/sql/base/characters_database.sql b/sql/base/characters_database.sql
index cf67ee214a4..7fcfa23a4e3 100644
--- a/sql/base/characters_database.sql
+++ b/sql/base/characters_database.sql
@@ -1,6 +1,6 @@
 -- MySQL dump 10.16  Distrib 10.1.6-MariaDB, for Win64 (AMD64)
 --
--- Host: localhost    Database: characters6
+-- Host: localhost    Database: characters
 -- ------------------------------------------------------
 -- Server version	5.7.14-log
 
@@ -740,10 +740,10 @@ DROP TABLE IF EXISTS `character_fishingsteps`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `character_fishingsteps` (
-  `guid` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0' COMMENT 'Global Unique Identifier',
-  `fishingSteps` TINYINT(3) UNSIGNED NOT NULL DEFAULT '0',
+  `guid` bigint(20) unsigned NOT NULL DEFAULT '0' COMMENT 'Global Unique Identifier',
+  `fishingSteps` tinyint(3) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`guid`)
-) ENGINE=INNODB DEFAULT CHARSET=utf8;
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -3251,7 +3251,7 @@ CREATE TABLE `updates` (
 
 LOCK TABLES `updates` WRITE;
 /*!40000 ALTER TABLE `updates` DISABLE KEYS */;
-INSERT INTO `updates` VALUES ('2014_10_20_00_characters.sql','A5882DA0979CF4DAE33DA011EBAA006C24BE7230','ARCHIVED','2015-03-21 15:55:55',0),('2014_10_23_00_characters.sql','E2AC4758133EE19B7F08464A445802154D1261C8','ARCHIVED','2015-03-21 15:55:55',0),('2014_10_23_01_characters.sql','20029E6323D9773B32C34D84FFED1711CC60F09F','ARCHIVED','2015-03-21 15:55:55',0),('2014_10_23_02_characters.sql','8A7A16886EE71E7ACDDB3DDA6D0ECAC2FD2FDCA8','ARCHIVED','2015-03-21 15:55:55',0),('2014_10_24_00_characters.sql','D008FE81AE844FCA686439D6ECC5108FB0DD1EB9','ARCHIVED','2015-03-21 15:55:55',0),('2014_10_25_00_characters.sql','A39C7BE46686B54776BDAB9D7A882D91EDEC51A4','ARCHIVED','2015-03-21 15:55:55',0),('2014_10_26_00_characters.sql','C787954CC35FE34B4101FDE6527F14C027F4947C','ARCHIVED','2015-03-21 15:55:55',0),('2014_11_12_00_characters.sql','B160BB2313F1BD5F3B076A5A9279DC10D4796E34','ARCHIVED','2015-03-21 15:55:55',0),('2014_12_23_00_characters.sql','3D9D648B2387B357F4BD090B33F80682F7924882','ARCHIVED','2015-03-21 15:55:55',0),('2014_12_28_00_characters.sql','5362922FF4483A336311D73082A5727309CD9219','ARCHIVED','2015-03-21 15:55:55',0),('2014_12_31_00_characters.sql','498DDF2DD936CF156D74A8208DC93DCE9FCAB5AA','ARCHIVED','2015-03-21 15:55:55',0),('2015_01_02_00_characters.sql','E5940BE836F253982E07930120422E598D08BDE1','ARCHIVED','2015-03-21 15:55:55',0),('2015_01_10_00_characters.sql','30796056C8623699B2FE1BF626A19D38262E9284','ARCHIVED','2015-03-21 15:55:55',0),('2015_01_16_00_characters.sql','96642760A54C8D799AAFE438049A63AA521656F2','ARCHIVED','2015-03-21 15:55:55',0),('2015_01_27_00_characters.sql','EB710E3EB9F2CAFD84AB62CDC84E898403A80A4F','ARCHIVED','2015-03-21 15:55:55',0),('2015_02_13_00_characters.sql','405BEB4ED207DC6076442A37EE2AFB1F21E274A0','ARCHIVED','2015-03-21 15:55:55',0),('2015_02_13_01_characters.sql','35F582D4F33BF55D1685A1BA89273ED895FD09C5','ARCHIVED','2015-03-21 15:55:55',0),('2015_02_17_00_characters.sql','8D21FC5A55BF8B55D6DCDCE5F02CF2B640230E94','ARCHIVED','2015-03-21 15:55:55',0),('2015_03_10_00_characters.sql','E565B89B145C340067742DFF2DEF1B74F5F1BD4E','ARCHIVED','2015-03-21 15:55:55',0),('2015_03_20_00_characters.sql','B761760804EA73BD297F296C5C1919687DF7191C','ARCHIVED','2015-03-21 15:55:55',0),('2015_03_20_01_characters.sql','20BD68468C57FCF7E665B4DA185DCD52FACE8B3F','ARCHIVED','2015-03-21 15:55:55',0),('2015_03_20_02_characters.sql','0296995DCD3676BA9AE6024CA7C91C5F39D927A3','ARCHIVED','2015-03-21 15:56:46',0),('2015_03_29_00_characters.sql','95D6A46BB746A8BD3EE3FE2086DF1A07F7C33B92','ARCHIVED','2015-05-02 15:43:06',0),('2015_04_21_00_characters.sql','F2032B9BF4EDA7EDE5065554724ED392FD91657D','ARCHIVED','2015-05-02 15:43:06',0),('2015_04_28_00_characters.sql','949F62DB3A3461D420A1230ECF7A6A3ED6435703','ARCHIVED','2015-05-02 15:43:06',0),('2015_05_08_00_characters.sql','0F14B7821618D1C872625B6EDDAA9A667B211167','ARCHIVED','2015-07-10 19:32:17',0),('2015_05_22_00_characters.sql','65B82152413FAB23BE413656E59A486A74447FF7','ARCHIVED','2015-07-10 19:32:17',0),('2015_07_08_00_characters.sql','DAB25360ACB5244C8F8E6214CF6BD97160588A5B','ARCHIVED','2015-07-10 19:32:17',0),('2015_07_11_00_characters.sql','B421B6C0E57BD0FD587071358863D9DABF4BA849','ARCHIVED','2015-07-13 21:50:02',0),('2015_07_12_00_characters.sql','E98E7FD61EF6426E7EDE8ED9AD8C15D8D7132589','ARCHIVED','2015-07-13 21:50:02',0),('2015_07_28_00_characters.sql','0711BC3A658D189EF71B0CB68DCFF2E9B781C4A0','ARCHIVED','2015-07-29 16:23:56',0),('2015_08_08_00_characters.sql','EA12BB2DC24FAF2300A96D0888A45BBEA158D5DC','ARCHIVED','2015-08-08 16:34:07',0),('2015_08_12_00_characters.sql','4FD7F89FE5DA51D4E0C33E520719986AA3EBD31B','ARCHIVED','2015-08-12 12:35:20',0),('2015_09_05_00_characters.sql','4C22BB29365BE4B6B95E64DAD84B63CA002304EA','ARCHIVED','2015-09-05 12:35:20',0),('2015_09_09_00_characters.sql','AFC32E693BC17CFD9A17919FE5317B8FE337ACAD','ARCHIVED','2015-09-09 12:35:20',0),('2015_09_10_00_characters.sql','4555A7F35C107E54C13D74D20F141039ED42943E','ARCHIVED','2015-09-10 22:50:42',0),('2015_10_16_00_characters.sql','E3A3FFF0CB42F04A8DCF0CE4362143C16E2083AF','ARCHIVED','2015-10-15 21:54:11',0),('2015_11_06_00_characters_2015_10_12_00.sql','D6F9927BDED72AD0A81D6EC2C6500CBC34A39FA2','ARCHIVED','2015-11-06 23:43:27',0),('2015_11_08_00_characters.sql','0ACDD35EC9745231BCFA701B78056DEF94D0CC53','ARCHIVED','2015-11-08 00:51:45',15),('2015_11_23_00_characters.sql','9FC828E9E48E8E2E9B99A5A0073D6614C5BFC6B5','ARCHIVED','2015-11-22 23:27:34',0),('2016_01_05_00_characters.sql','0EAD24977F40DE2476B4567DA2B477867CC0DA1A','ARCHIVED','2016-01-04 23:07:40',0),('2016_04_05_00_characters_2016_02_10_00_characters.sql','F1B4DA202819CABC7319A4470A2D224A34609E97','ARCHIVED','2016-04-05 20:34:41',0),('2016_04_11_00_characters.sql','0ACDD35EC9745231BCFA701B78056DEF94D0CC53','ARCHIVED','2016-04-11 02:24:14',30),('2016_04_11_01_characters.sql','CA90F6D99C1EEA7B25BD58BC8368A8D78234BBEF','ARCHIVED','2016-04-11 18:14:18',0),('2016_05_07_00_characters.sql','D1DB5557B21A552C935564D829B4E98B98149077','ARCHIVED','2016-05-07 00:00:00',0),('2016_05_26_00_characters.sql','4179ADC32B96FD8D7D4CF5509A470B1ACE00BE85','ARCHIVED','2016-05-26 17:06:16',0),('2016_07_16_00_characters.sql','EF267FCB92B383FFB33C700508EAF3FBC1F8AC23','ARCHIVED','2016-07-16 14:45:12',0),('2016_07_19_00_characters.sql','AA2C516FA81B451071EA82F58F447E9D13E5D1BD','ARCHIVED','2016-07-19 14:36:25',0),('2016_07_19_01_characters.sql','E9AF46AF4C7CC2E2779E44254AEEDF880D020166','ARCHIVED','2016-07-19 14:36:25',0),('2016_07_19_02_characters.sql','5B1B334449996F3639C9226F587129E03DC4BF6D','ARCHIVED','2016-07-19 14:36:26',0),('2016_07_19_03_characters.sql','7787C8A67D720492FED4BF60ADB22D3CDE1C536D','ARCHIVED','2016-07-19 14:36:26',0),('2016_07_19_04_characters.sql','6D4B536094367AC9EF7CDFF41A4F96EB00B25EE5','ARCHIVED','2016-07-19 14:36:26',0),('2016_07_19_05_characters.sql','12639268DC5F78CE900B59D5C646B10D70842928','ARCHIVED','2016-07-19 14:36:27',0),('2016_07_19_06_characters.sql','9F5A4B533E6BFBAA718DE5160E1FDCB8471A88BF','ARCHIVED','2016-07-19 14:36:28',0),('2016_07_19_07_characters.sql','1E8273FFD4340CBD7BB71D2406E23E9EF7230CFA','ARCHIVED','2016-07-19 14:36:29',0),('2016_07_19_08_characters.sql','FB41FD2F8A7114FEE154021A9D47488C4B12E2A9','ARCHIVED','2016-07-19 14:36:29',0),('2016_08_15_00_characters.sql','BF0B5F453384210CD77C54E262A19B888AAA4095','ARCHIVED','2016-08-14 18:14:32',0),('2016_08_25_00_characters.sql','4AD506C3FCE54238EF452AC07EC562BD41A9D50C','ARCHIVED','2016-08-25 22:54:11',0),('2016_10_17_00_characters.sql','A0EF594CD73690D46A46031137DB0E895F079235','RELEASED','2016-10-16 16:33:05',25),('2016_10_25_00_characters.sql','CC894484561CE138C10B69D34F7831CEDFAF496B','RELEASED','2016-10-25 17:19:35',0),('2016_11_06_00_characters.sql','C7EC8B65C1BE7722C53BAB79C52C1549054178C0','RELEASED','2016-11-06 23:05:44',0),('2016_12_09_00_characters.sql','2A68E4187CE7F7294CBC3804AC39F48B2727E64E','RELEASED','2016-12-09 18:38:46',0),('2016_12_26_00_characters.sql','D265DE655DDBFC13E2FA1EB021A435A21189B6E4','RELEASED','2016-12-26 18:45:15',0),('2017_01_22_00_characters.sql','62B08B5FB1DA7B207C74DC000C42517A2D6F6BCC','RELEASED','2017-01-22 02:06:31',0),('2017_01_29_00_characters.sql','E7475DCC13A0910FF23BF0EFB731629950A73A0D','RELEASED','2017-01-29 15:00:00',0),('2017_02_26_00_characters_2016_09_13_00_characters.sql','2EF7AD507D097ABC74FF1E98A65BEC03B12E51C6','RELEASED','2017-02-26 19:57:47',0),('2017_04_15_00_characters.sql','F118BA33CD7DDF2EE5673C6749C2965EFFF53C23','RELEASED','2017-04-15 12:10:50',0);
+INSERT INTO `updates` VALUES ('2014_10_20_00_characters.sql','A5882DA0979CF4DAE33DA011EBAA006C24BE7230','ARCHIVED','2015-03-21 15:55:55',0),('2014_10_23_00_characters.sql','E2AC4758133EE19B7F08464A445802154D1261C8','ARCHIVED','2015-03-21 15:55:55',0),('2014_10_23_01_characters.sql','20029E6323D9773B32C34D84FFED1711CC60F09F','ARCHIVED','2015-03-21 15:55:55',0),('2014_10_23_02_characters.sql','8A7A16886EE71E7ACDDB3DDA6D0ECAC2FD2FDCA8','ARCHIVED','2015-03-21 15:55:55',0),('2014_10_24_00_characters.sql','D008FE81AE844FCA686439D6ECC5108FB0DD1EB9','ARCHIVED','2015-03-21 15:55:55',0),('2014_10_25_00_characters.sql','A39C7BE46686B54776BDAB9D7A882D91EDEC51A4','ARCHIVED','2015-03-21 15:55:55',0),('2014_10_26_00_characters.sql','C787954CC35FE34B4101FDE6527F14C027F4947C','ARCHIVED','2015-03-21 15:55:55',0),('2014_11_12_00_characters.sql','B160BB2313F1BD5F3B076A5A9279DC10D4796E34','ARCHIVED','2015-03-21 15:55:55',0),('2014_12_23_00_characters.sql','3D9D648B2387B357F4BD090B33F80682F7924882','ARCHIVED','2015-03-21 15:55:55',0),('2014_12_28_00_characters.sql','5362922FF4483A336311D73082A5727309CD9219','ARCHIVED','2015-03-21 15:55:55',0),('2014_12_31_00_characters.sql','498DDF2DD936CF156D74A8208DC93DCE9FCAB5AA','ARCHIVED','2015-03-21 15:55:55',0),('2015_01_02_00_characters.sql','E5940BE836F253982E07930120422E598D08BDE1','ARCHIVED','2015-03-21 15:55:55',0),('2015_01_10_00_characters.sql','30796056C8623699B2FE1BF626A19D38262E9284','ARCHIVED','2015-03-21 15:55:55',0),('2015_01_16_00_characters.sql','96642760A54C8D799AAFE438049A63AA521656F2','ARCHIVED','2015-03-21 15:55:55',0),('2015_01_27_00_characters.sql','EB710E3EB9F2CAFD84AB62CDC84E898403A80A4F','ARCHIVED','2015-03-21 15:55:55',0),('2015_02_13_00_characters.sql','405BEB4ED207DC6076442A37EE2AFB1F21E274A0','ARCHIVED','2015-03-21 15:55:55',0),('2015_02_13_01_characters.sql','35F582D4F33BF55D1685A1BA89273ED895FD09C5','ARCHIVED','2015-03-21 15:55:55',0),('2015_02_17_00_characters.sql','8D21FC5A55BF8B55D6DCDCE5F02CF2B640230E94','ARCHIVED','2015-03-21 15:55:55',0),('2015_03_10_00_characters.sql','E565B89B145C340067742DFF2DEF1B74F5F1BD4E','ARCHIVED','2015-03-21 15:55:55',0),('2015_03_20_00_characters.sql','B761760804EA73BD297F296C5C1919687DF7191C','ARCHIVED','2015-03-21 15:55:55',0),('2015_03_20_01_characters.sql','20BD68468C57FCF7E665B4DA185DCD52FACE8B3F','ARCHIVED','2015-03-21 15:55:55',0),('2015_03_20_02_characters.sql','0296995DCD3676BA9AE6024CA7C91C5F39D927A3','ARCHIVED','2015-03-21 15:56:46',0),('2015_03_29_00_characters.sql','95D6A46BB746A8BD3EE3FE2086DF1A07F7C33B92','ARCHIVED','2015-05-02 15:43:06',0),('2015_04_21_00_characters.sql','F2032B9BF4EDA7EDE5065554724ED392FD91657D','ARCHIVED','2015-05-02 15:43:06',0),('2015_04_28_00_characters.sql','949F62DB3A3461D420A1230ECF7A6A3ED6435703','ARCHIVED','2015-05-02 15:43:06',0),('2015_05_08_00_characters.sql','0F14B7821618D1C872625B6EDDAA9A667B211167','ARCHIVED','2015-07-10 19:32:17',0),('2015_05_22_00_characters.sql','65B82152413FAB23BE413656E59A486A74447FF7','ARCHIVED','2015-07-10 19:32:17',0),('2015_07_08_00_characters.sql','DAB25360ACB5244C8F8E6214CF6BD97160588A5B','ARCHIVED','2015-07-10 19:32:17',0),('2015_07_11_00_characters.sql','B421B6C0E57BD0FD587071358863D9DABF4BA849','ARCHIVED','2015-07-13 21:50:02',0),('2015_07_12_00_characters.sql','E98E7FD61EF6426E7EDE8ED9AD8C15D8D7132589','ARCHIVED','2015-07-13 21:50:02',0),('2015_07_28_00_characters.sql','0711BC3A658D189EF71B0CB68DCFF2E9B781C4A0','ARCHIVED','2015-07-29 16:23:56',0),('2015_08_08_00_characters.sql','EA12BB2DC24FAF2300A96D0888A45BBEA158D5DC','ARCHIVED','2015-08-08 16:34:07',0),('2015_08_12_00_characters.sql','4FD7F89FE5DA51D4E0C33E520719986AA3EBD31B','ARCHIVED','2015-08-12 12:35:20',0),('2015_09_05_00_characters.sql','4C22BB29365BE4B6B95E64DAD84B63CA002304EA','ARCHIVED','2015-09-05 12:35:20',0),('2015_09_09_00_characters.sql','AFC32E693BC17CFD9A17919FE5317B8FE337ACAD','ARCHIVED','2015-09-09 12:35:20',0),('2015_09_10_00_characters.sql','4555A7F35C107E54C13D74D20F141039ED42943E','ARCHIVED','2015-09-10 22:50:42',0),('2015_10_16_00_characters.sql','E3A3FFF0CB42F04A8DCF0CE4362143C16E2083AF','ARCHIVED','2015-10-15 21:54:11',0),('2015_11_06_00_characters_2015_10_12_00.sql','D6F9927BDED72AD0A81D6EC2C6500CBC34A39FA2','ARCHIVED','2015-11-06 23:43:27',0),('2015_11_08_00_characters.sql','0ACDD35EC9745231BCFA701B78056DEF94D0CC53','ARCHIVED','2015-11-08 00:51:45',15),('2015_11_23_00_characters.sql','9FC828E9E48E8E2E9B99A5A0073D6614C5BFC6B5','ARCHIVED','2015-11-22 23:27:34',0),('2016_01_05_00_characters.sql','0EAD24977F40DE2476B4567DA2B477867CC0DA1A','ARCHIVED','2016-01-04 23:07:40',0),('2016_04_05_00_characters_2016_02_10_00_characters.sql','F1B4DA202819CABC7319A4470A2D224A34609E97','ARCHIVED','2016-04-05 20:34:41',0),('2016_04_11_00_characters.sql','0ACDD35EC9745231BCFA701B78056DEF94D0CC53','ARCHIVED','2016-04-11 02:24:14',30),('2016_04_11_01_characters.sql','CA90F6D99C1EEA7B25BD58BC8368A8D78234BBEF','ARCHIVED','2016-04-11 18:14:18',0),('2016_05_07_00_characters.sql','D1DB5557B21A552C935564D829B4E98B98149077','ARCHIVED','2016-05-07 00:00:00',0),('2016_05_26_00_characters.sql','4179ADC32B96FD8D7D4CF5509A470B1ACE00BE85','ARCHIVED','2016-05-26 17:06:16',0),('2016_07_16_00_characters.sql','EF267FCB92B383FFB33C700508EAF3FBC1F8AC23','ARCHIVED','2016-07-16 14:45:12',0),('2016_07_19_00_characters.sql','AA2C516FA81B451071EA82F58F447E9D13E5D1BD','ARCHIVED','2016-07-19 14:36:25',0),('2016_07_19_01_characters.sql','E9AF46AF4C7CC2E2779E44254AEEDF880D020166','ARCHIVED','2016-07-19 14:36:25',0),('2016_07_19_02_characters.sql','5B1B334449996F3639C9226F587129E03DC4BF6D','ARCHIVED','2016-07-19 14:36:26',0),('2016_07_19_03_characters.sql','7787C8A67D720492FED4BF60ADB22D3CDE1C536D','ARCHIVED','2016-07-19 14:36:26',0),('2016_07_19_04_characters.sql','6D4B536094367AC9EF7CDFF41A4F96EB00B25EE5','ARCHIVED','2016-07-19 14:36:26',0),('2016_07_19_05_characters.sql','12639268DC5F78CE900B59D5C646B10D70842928','ARCHIVED','2016-07-19 14:36:27',0),('2016_07_19_06_characters.sql','9F5A4B533E6BFBAA718DE5160E1FDCB8471A88BF','ARCHIVED','2016-07-19 14:36:28',0),('2016_07_19_07_characters.sql','1E8273FFD4340CBD7BB71D2406E23E9EF7230CFA','ARCHIVED','2016-07-19 14:36:29',0),('2016_07_19_08_characters.sql','FB41FD2F8A7114FEE154021A9D47488C4B12E2A9','ARCHIVED','2016-07-19 14:36:29',0),('2016_08_15_00_characters.sql','BF0B5F453384210CD77C54E262A19B888AAA4095','ARCHIVED','2016-08-14 18:14:32',0),('2016_08_25_00_characters.sql','4AD506C3FCE54238EF452AC07EC562BD41A9D50C','ARCHIVED','2016-08-25 22:54:11',0),('2016_10_17_00_characters.sql','A0EF594CD73690D46A46031137DB0E895F079235','ARCHIVED','2016-10-16 16:33:05',25),('2016_10_25_00_characters.sql','CC894484561CE138C10B69D34F7831CEDFAF496B','ARCHIVED','2016-10-25 17:19:35',0),('2016_11_06_00_characters.sql','C7EC8B65C1BE7722C53BAB79C52C1549054178C0','ARCHIVED','2016-11-06 23:05:44',0),('2016_12_09_00_characters.sql','2A68E4187CE7F7294CBC3804AC39F48B2727E64E','ARCHIVED','2016-12-09 18:38:46',0),('2016_12_26_00_characters.sql','D265DE655DDBFC13E2FA1EB021A435A21189B6E4','ARCHIVED','2016-12-26 18:45:15',0),('2017_01_22_00_characters.sql','62B08B5FB1DA7B207C74DC000C42517A2D6F6BCC','ARCHIVED','2017-01-22 02:06:31',0),('2017_01_29_00_characters.sql','E7475DCC13A0910FF23BF0EFB731629950A73A0D','ARCHIVED','2017-01-29 15:00:00',0),('2017_02_26_00_characters_2016_09_13_00_characters.sql','2EF7AD507D097ABC74FF1E98A65BEC03B12E51C6','ARCHIVED','2017-02-26 19:57:47',0),('2017_04_15_00_characters.sql','F118BA33CD7DDF2EE5673C6749C2965EFFF53C23','ARCHIVED','2017-04-15 12:10:50',0),('2017_04_19_00_characters.sql','5A36FD9015ED024BC085F995F72DC81B47CD1093','RELEASED','2017-04-18 23:16:18',30);
 /*!40000 ALTER TABLE `updates` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -3275,7 +3275,7 @@ CREATE TABLE `updates_include` (
 
 LOCK TABLES `updates_include` WRITE;
 /*!40000 ALTER TABLE `updates_include` DISABLE KEYS */;
-INSERT INTO `updates_include` VALUES ('$/sql/updates/characters','RELEASED'),('$/sql/custom/characters','RELEASED'),('$/sql/old/6.x/characters','ARCHIVED');
+INSERT INTO `updates_include` VALUES ('$/sql/updates/characters','RELEASED'),('$/sql/custom/characters','RELEASED'),('$/sql/old/6.x/characters','ARCHIVED'),('$/sql/old/7/characters','ARCHIVED');
 /*!40000 ALTER TABLE `updates_include` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -3336,4 +3336,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2016-10-16 17:35:47
+-- Dump completed on 2017-04-19  0:17:39
diff --git a/sql/base/dev/DO_NOT_IMPORT_THESE_FILES.txt b/sql/base/dev/DO_NOT_IMPORT_THESE_FILES.txt
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/sql/base/dev/DO_NOT_IMPORT_THESE_FILES.txt
diff --git a/sql/base/dev/README.TXT b/sql/base/dev/README.TXT
deleted file mode 100644
index 2717026f35b..00000000000
--- a/sql/base/dev/README.TXT
+++ /dev/null
@@ -1 +0,0 @@
-The file world_database.sql is intended to be used only by travis compile test system, don't import it, you will break your core.
diff --git a/sql/base/dev/hotfixes_database.sql b/sql/base/dev/hotfixes_database.sql
index fd6ddee9266..6f4fb59d5a7 100644
--- a/sql/base/dev/hotfixes_database.sql
+++ b/sql/base/dev/hotfixes_database.sql
@@ -31,13 +31,13 @@ CREATE TABLE `achievement` (
   `Supercedes` smallint(5) unsigned NOT NULL DEFAULT '0',
   `Category` smallint(5) unsigned NOT NULL DEFAULT '0',
   `UIOrder` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `IconID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `SharesCriteria` smallint(5) unsigned NOT NULL DEFAULT '0',
   `CriteriaTree` smallint(5) unsigned NOT NULL DEFAULT '0',
   `Faction` tinyint(4) NOT NULL DEFAULT '0',
   `Points` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `MinimumCriteria` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `IconFileDataID` int(10) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -263,6 +263,8 @@ CREATE TABLE `artifact` (
   `SpecID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `ArtifactCategoryID` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `Flags` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `UiModelSceneID` int(10) unsigned NOT NULL DEFAULT '0',
+  `SpellVisualKitID` int(10) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -282,13 +284,13 @@ CREATE TABLE `artifact_appearance` (
   `ModelAlpha` float NOT NULL DEFAULT '0',
   `ShapeshiftDisplayID` int(10) unsigned NOT NULL DEFAULT '0',
   `ArtifactAppearanceSetID` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `PlayerConditionID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `Unknown` smallint(5) unsigned NOT NULL DEFAULT '0',
   `DisplayIndex` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `AppearanceModID` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `Flags` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `ModifiesShapeshiftFormDisplay` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `PlayerConditionID` int(10) unsigned NOT NULL DEFAULT '0',
   `ItemAppearanceID` int(10) unsigned NOT NULL DEFAULT '0',
   `AltItemAppearanceID` int(10) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
@@ -396,6 +398,7 @@ CREATE TABLE `artifact_power` (
   `ArtifactID` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `Flags` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `MaxRank` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `ArtifactTier` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `RelicType` int(11) NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
@@ -616,6 +619,8 @@ CREATE TABLE `battle_pet_species` (
   `PetType` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `Source` tinyint(4) NOT NULL DEFAULT '0',
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `CardModelSceneID` int(10) unsigned NOT NULL DEFAULT '0',
+  `LoadoutModelSceneID` int(10) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -667,6 +672,8 @@ CREATE TABLE `battlemaster_list` (
   `Name` text,
   `IconFileDataID` int(10) unsigned NOT NULL DEFAULT '0',
   `GameType` text,
+  `ShortDescription` text,
+  `LongDescription` text,
   `MapID1` smallint(6) NOT NULL DEFAULT '0',
   `MapID2` smallint(6) NOT NULL DEFAULT '0',
   `MapID3` smallint(6) NOT NULL DEFAULT '0',
@@ -711,6 +718,8 @@ CREATE TABLE `battlemaster_list_locale` (
   `locale` varchar(4) NOT NULL,
   `Name_lang` text,
   `GameType_lang` text,
+  `ShortDescription_lang` text,
+  `LongDescription_lang` text,
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`,`locale`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -913,6 +922,7 @@ CREATE TABLE `chr_classes` (
   `Filename` text,
   `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',
   `Flags` smallint(5) unsigned NOT NULL DEFAULT '0',
   `CinematicSequenceID` smallint(5) unsigned NOT NULL DEFAULT '0',
@@ -922,7 +932,6 @@ CREATE TABLE `chr_classes` (
   `AttackPowerPerStrength` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `AttackPowerPerAgility` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `RangedAttackPowerPerAgility` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `IconFileDataID` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `Unk1` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
@@ -992,14 +1001,11 @@ CREATE TABLE `chr_races` (
   `FemaleCustomizeOffset3` float NOT NULL DEFAULT '0',
   `LowResScreenFileDataID` int(10) unsigned NOT NULL DEFAULT '0',
   `FactionID` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `ExplorationSoundID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `MaleDisplayID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `FemaleDisplayID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `ResSicknessSpellID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `SplashSoundID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `CinematicSequenceID` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `UAMaleCreatureSoundDataID` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `UAFemaleCreatureSoundDataID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `BaseLanguage` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `CreatureType` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `TeamID` tinyint(3) unsigned NOT NULL DEFAULT '0',
@@ -1051,14 +1057,13 @@ CREATE TABLE `chr_specialization` (
   `Name` text,
   `Name2` text,
   `Description` text,
-  `BackgroundFile` text,
-  `SpellIconID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `ClassID` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `OrderIndex` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `PetTalentType` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `Role` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `PrimaryStatOrder` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `IconFileDataID` int(10) unsigned NOT NULL DEFAULT '0',
   `Flags` int(10) unsigned NOT NULL DEFAULT '0',
   `AnimReplacementSetID` int(10) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
@@ -1134,6 +1139,26 @@ CREATE TABLE `chr_upgrade_tier` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `cinematic_camera`
+--
+
+DROP TABLE IF EXISTS `cinematic_camera`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `cinematic_camera` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `SoundID` int(10) unsigned NOT NULL DEFAULT '0',
+  `OriginX` float NOT NULL DEFAULT '0',
+  `OriginY` float NOT NULL DEFAULT '0',
+  `OriginZ` float NOT NULL DEFAULT '0',
+  `OriginFacing` float NOT NULL DEFAULT '0',
+  `ModelFileDataID` int(10) unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `cinematic_sequences`
 --
 
@@ -1142,7 +1167,7 @@ DROP TABLE IF EXISTS `cinematic_sequences`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `cinematic_sequences` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `SoundID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `SoundID` int(10) unsigned NOT NULL DEFAULT '0',
   `Camera1` smallint(5) unsigned NOT NULL DEFAULT '0',
   `Camera2` smallint(5) unsigned NOT NULL DEFAULT '0',
   `Camera3` smallint(5) unsigned NOT NULL DEFAULT '0',
@@ -1225,29 +1250,30 @@ DROP TABLE IF EXISTS `creature_display_info`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `creature_display_info` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `ExtendedDisplayInfoID` int(10) unsigned NOT NULL DEFAULT '0',
   `CreatureModelScale` float NOT NULL DEFAULT '0',
-  `PlayerModelScale` float NOT NULL DEFAULT '0',
+  `ModelID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `NPCSoundID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `SizeClass` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Flags` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Gender` tinyint(4) NOT NULL DEFAULT '0',
+  `ExtendedDisplayInfoID` int(10) unsigned NOT NULL DEFAULT '0',
   `TextureVariation1` int(10) unsigned NOT NULL DEFAULT '0',
   `TextureVariation2` int(10) unsigned NOT NULL DEFAULT '0',
   `TextureVariation3` int(10) unsigned NOT NULL DEFAULT '0',
-  `PortraitTextureName` text,
-  `PortraitCreatureDisplayInfoID` int(10) unsigned NOT NULL DEFAULT '0',
-  `CreatureGeosetData` int(10) unsigned NOT NULL DEFAULT '0',
-  `StateSpellVisualKitID` int(10) unsigned NOT NULL DEFAULT '0',
-  `InstanceOtherPlayerPetScale` float NOT NULL DEFAULT '0',
-  `ModelID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `PortraitTextureFileDataID` int(10) unsigned NOT NULL DEFAULT '0',
+  `CreatureModelAlpha` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `SoundID` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `NPCSoundID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `PlayerModelScale` float NOT NULL DEFAULT '0',
+  `PortraitCreatureDisplayInfoID` int(10) unsigned NOT NULL DEFAULT '0',
+  `BloodID` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `ParticleColorID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `CreatureGeosetData` int(10) unsigned NOT NULL DEFAULT '0',
   `ObjectEffectPackageID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `AnimReplacementSetID` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `CreatureModelAlpha` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `SizeClass` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `BloodID` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `Flags` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `Gender` tinyint(4) NOT NULL DEFAULT '0',
-  `Unk700` tinyint(4) NOT NULL DEFAULT '0',
+  `UnarmedWeaponSubclass` tinyint(4) NOT NULL DEFAULT '0',
+  `StateSpellVisualKitID` int(10) unsigned NOT NULL DEFAULT '0',
+  `InstanceOtherPlayerPetScale` float NOT NULL DEFAULT '0',
+  `MountSpellVisualKitID` int(10) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -1293,7 +1319,7 @@ CREATE TABLE `creature_family` (
   `MinScale` float NOT NULL DEFAULT '0',
   `MaxScale` float NOT NULL DEFAULT '0',
   `Name` text,
-  `IconFile` text,
+  `IconFileDataID` int(10) unsigned NOT NULL DEFAULT '0',
   `SkillLine1` smallint(5) unsigned NOT NULL DEFAULT '0',
   `SkillLine2` smallint(5) unsigned NOT NULL DEFAULT '0',
   `PetFoodMask` smallint(5) unsigned NOT NULL DEFAULT '0',
@@ -1361,8 +1387,6 @@ CREATE TABLE `creature_model_data` (
   `FoleyMaterialID` int(10) unsigned NOT NULL DEFAULT '0',
   `FootstepEffectID` int(10) unsigned NOT NULL DEFAULT '0',
   `DeathThudEffectID` int(10) unsigned NOT NULL DEFAULT '0',
-  `FootstepShakeSize` int(10) unsigned NOT NULL DEFAULT '0',
-  `DeathThudShakeSize` int(10) unsigned NOT NULL DEFAULT '0',
   `SoundID` int(10) unsigned NOT NULL DEFAULT '0',
   `CreatureGeosetDataID` int(10) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
@@ -1436,12 +1460,12 @@ DROP TABLE IF EXISTS `criteria_tree`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `criteria_tree` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `CriteriaID` int(10) unsigned NOT NULL DEFAULT '0',
   `Amount` int(10) unsigned NOT NULL DEFAULT '0',
   `Description` text,
   `Parent` smallint(5) unsigned NOT NULL DEFAULT '0',
   `Flags` smallint(5) unsigned NOT NULL DEFAULT '0',
   `Operator` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `CriteriaID` int(10) unsigned NOT NULL DEFAULT '0',
   `OrderIndex` int(11) NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
@@ -1586,6 +1610,9 @@ DROP TABLE IF EXISTS `difficulty`;
 CREATE TABLE `difficulty` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `Name` text,
+  `GroupSizeHealthCurveID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `GroupSizeDmgCurveID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `GroupSizeSpellPointsCurveID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `FallbackDifficultyID` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `InstanceType` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `MinPlayers` tinyint(3) unsigned NOT NULL DEFAULT '0',
@@ -1593,9 +1620,6 @@ CREATE TABLE `difficulty` (
   `OldEnumValue` tinyint(4) NOT NULL DEFAULT '0',
   `Flags` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `ToggleDifficultyID` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `GroupSizeHealthCurveID` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `GroupSizeDmgCurveID` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `GroupSizeSpellPointsCurveID` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `ItemBonusTreeModID` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `OrderIndex` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
@@ -1627,15 +1651,15 @@ DROP TABLE IF EXISTS `dungeon_encounter`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `dungeon_encounter` (
-  `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `Name` text,
   `CreatureDisplayID` int(10) unsigned NOT NULL DEFAULT '0',
   `MapID` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `SpellIconID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `DifficultyID` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `Bit` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `Flags` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `OrderIndex` int(11) NOT NULL DEFAULT '0',
+  `TextureFileDataID` int(10) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -1824,6 +1848,7 @@ CREATE TABLE `faction` (
   `ReputationFlags3` smallint(5) unsigned NOT NULL DEFAULT '0',
   `ReputationFlags4` smallint(5) unsigned NOT NULL DEFAULT '0',
   `ParentFactionID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `ParagonFactionID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `ParentFactionCapIn` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `ParentFactionCapOut` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `Expansion` tinyint(3) unsigned NOT NULL DEFAULT '0',
@@ -2081,7 +2106,7 @@ CREATE TABLE `garr_class_spec` (
   `NameFemale` text,
   `NameGenderless` text,
   `ClassAtlasID` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `GarrFollItemSetID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `GarrFollItemSetID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `Limit` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `Flags` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
@@ -2124,6 +2149,7 @@ CREATE TABLE `garr_follower` (
   `AlliancePortraitIconID` int(10) unsigned NOT NULL DEFAULT '0',
   `HordeAddedBroadcastTextID` int(10) unsigned NOT NULL DEFAULT '0',
   `AllianceAddedBroadcastTextID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Name` text,
   `HordeGarrFollItemSetID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `AllianceGarrFollItemSetID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `ItemLevelWeapon` smallint(5) unsigned NOT NULL DEFAULT '0',
@@ -2164,6 +2190,7 @@ CREATE TABLE `garr_follower_locale` (
   `locale` varchar(4) NOT NULL,
   `HordeSourceText_lang` text,
   `AllianceSourceText_lang` text,
+  `Name_lang` text,
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`,`locale`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -2285,11 +2312,11 @@ CREATE TABLE `garr_site_level` (
   `TownHallY` float NOT NULL DEFAULT '0',
   `MapID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `SiteID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `MovieID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `UpgradeResourceCost` smallint(5) unsigned NOT NULL DEFAULT '0',
   `UpgradeMoneyCost` smallint(5) unsigned NOT NULL DEFAULT '0',
   `Level` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `UITextureKitID` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `MovieID` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `Level2` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
@@ -2537,11 +2564,11 @@ CREATE TABLE `holidays` (
   `CalendarFlags8` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `CalendarFlags9` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `CalendarFlags10` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `HolidayNameID` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `HolidayDescriptionID` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `Priority` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `CalendarFilterType` tinyint(4) NOT NULL DEFAULT '0',
   `Flags` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `HolidayNameID` int(10) unsigned NOT NULL DEFAULT '0',
+  `HolidayDescriptionID` int(10) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -2806,6 +2833,7 @@ CREATE TABLE `item_bonus_tree_node` (
   `BonusTreeID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `SubTreeID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `BonusListID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `ItemLevelSelectorID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `BonusTreeModID` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
@@ -2840,6 +2868,7 @@ CREATE TABLE `item_class` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `PriceMod` float NOT NULL DEFAULT '0',
   `Name` text,
+  `OldEnumValue` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `Flags` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
@@ -3344,9 +3373,9 @@ CREATE TABLE `item_sparse` (
   `Flags3` int(10) unsigned NOT NULL DEFAULT '0',
   `Unk1` float NOT NULL DEFAULT '0',
   `Unk2` float NOT NULL DEFAULT '0',
+  `BuyCount` int(10) unsigned NOT NULL DEFAULT '0',
   `BuyPrice` int(10) unsigned NOT NULL DEFAULT '0',
   `SellPrice` int(10) unsigned NOT NULL DEFAULT '0',
-  `AllowableClass` int(11) NOT NULL DEFAULT '0',
   `AllowableRace` int(11) NOT NULL DEFAULT '0',
   `RequiredSpell` int(10) unsigned NOT NULL DEFAULT '0',
   `MaxCount` int(10) unsigned NOT NULL DEFAULT '0',
@@ -3381,6 +3410,7 @@ CREATE TABLE `item_sparse` (
   `ArmorDamageModifier` float NOT NULL DEFAULT '0',
   `Duration` int(10) unsigned NOT NULL DEFAULT '0',
   `StatScalingFactor` float NOT NULL DEFAULT '0',
+  `AllowableClass` smallint(6) NOT NULL DEFAULT '0',
   `ItemLevel` smallint(5) unsigned NOT NULL DEFAULT '0',
   `RequiredSkill` smallint(5) unsigned NOT NULL DEFAULT '0',
   `RequiredSkillRank` smallint(5) unsigned NOT NULL DEFAULT '0',
@@ -3405,13 +3435,14 @@ CREATE TABLE `item_sparse` (
   `ItemSet` smallint(5) unsigned NOT NULL DEFAULT '0',
   `Area` smallint(5) unsigned NOT NULL DEFAULT '0',
   `Map` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `TotemCategory` smallint(5) unsigned NOT NULL DEFAULT '0',
   `SocketBonus` smallint(5) unsigned NOT NULL DEFAULT '0',
   `GemProperties` smallint(5) unsigned NOT NULL DEFAULT '0',
   `ItemLimitCategory` smallint(5) unsigned NOT NULL DEFAULT '0',
   `HolidayID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `RequiredTransmogHolidayID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `ItemNameDescriptionID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `Quality` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `BuyCount` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `InventoryType` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `RequiredLevel` tinyint(4) NOT NULL DEFAULT '0',
   `RequiredHonorRank` tinyint(3) unsigned NOT NULL DEFAULT '0',
@@ -3434,7 +3465,6 @@ CREATE TABLE `item_sparse` (
   `PageMaterial` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `Material` tinyint(4) NOT NULL DEFAULT '0',
   `Sheath` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `TotemCategory` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `SocketColor1` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `SocketColor2` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `SocketColor3` tinyint(3) unsigned NOT NULL DEFAULT '0',
@@ -3596,7 +3626,7 @@ CREATE TABLE `lfg_dungeons` (
   `Flags` int(10) unsigned NOT NULL DEFAULT '0',
   `TextureFilename` text,
   `Description` text,
-  `PlayerConditionID` int(10) unsigned NOT NULL DEFAULT '0',
+  `MinItemLevel` float NOT NULL DEFAULT '0',
   `MaxLevel` smallint(5) unsigned NOT NULL DEFAULT '0',
   `TargetLevelMax` smallint(5) unsigned NOT NULL DEFAULT '0',
   `MapID` smallint(6) NOT NULL DEFAULT '0',
@@ -3605,6 +3635,7 @@ CREATE TABLE `lfg_dungeons` (
   `LastBossJournalEncounterID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `BonusReputationAmount` smallint(5) unsigned NOT NULL DEFAULT '0',
   `MentorItemLevel` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `PlayerConditionID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `MinLevel` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `TargetLevel` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `TargetLevelMin` tinyint(3) unsigned NOT NULL DEFAULT '0',
@@ -3848,6 +3879,8 @@ CREATE TABLE `map` (
   `MapName` text,
   `MapDescription0` text,
   `MapDescription1` text,
+  `ShortDescription` text,
+  `LongDescription` text,
   `AreaTableID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `LoadingScreenID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `CorpseMapID` smallint(6) NOT NULL DEFAULT '0',
@@ -3916,6 +3949,8 @@ CREATE TABLE `map_locale` (
   `MapName_lang` text,
   `MapDescription0_lang` text,
   `MapDescription1_lang` text,
+  `ShortDescription_lang` text,
+  `LongDescription_lang` text,
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`,`locale`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -3951,16 +3986,16 @@ DROP TABLE IF EXISTS `mount`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `mount` (
   `SpellId` int(10) unsigned NOT NULL DEFAULT '0',
-  `DisplayId` int(10) unsigned NOT NULL DEFAULT '0',
   `Name` text,
   `Description` text,
   `SourceDescription` text,
   `CameraPivotMultiplier` float NOT NULL DEFAULT '0',
   `MountTypeId` smallint(5) unsigned NOT NULL DEFAULT '0',
   `Flags` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `PlayerConditionId` smallint(5) unsigned NOT NULL DEFAULT '0',
   `Source` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `PlayerConditionId` int(10) unsigned NOT NULL DEFAULT '0',
+  `UiModelSceneID` int(11) NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -4023,6 +4058,23 @@ CREATE TABLE `mount_type_x_capability` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `mount_x_display`
+--
+
+DROP TABLE IF EXISTS `mount_x_display`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `mount_x_display` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `MountID` int(10) unsigned NOT NULL DEFAULT '0',
+  `DisplayID` int(10) unsigned NOT NULL DEFAULT '0',
+  `PlayerConditionID` int(10) unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `movie`
 --
 
@@ -4329,8 +4381,9 @@ CREATE TABLE `player_condition` (
   `PhaseGroupID` int(10) unsigned NOT NULL DEFAULT '0',
   `MinAvgItemLevel` int(10) unsigned NOT NULL DEFAULT '0',
   `MaxAvgItemLevel` int(10) unsigned NOT NULL DEFAULT '0',
-  `Unknown7001` int(11) NOT NULL DEFAULT '0',
-  `Unknown7002` int(11) NOT NULL DEFAULT '0',
+  `MovementFlags1` int(11) NOT NULL DEFAULT '0',
+  `MovementFlags2` int(11) NOT NULL DEFAULT '0',
+  `MainHandItemSubclassMask` int(10) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -4474,8 +4527,8 @@ CREATE TABLE `quest_package_item` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `ItemID` int(10) unsigned NOT NULL DEFAULT '0',
   `QuestPackageID` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `ItemCount` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `FilterType` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `ItemCount` int(10) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -4615,6 +4668,80 @@ CREATE TABLE `scaling_stat_distribution` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `scenario`
+--
+
+DROP TABLE IF EXISTS `scenario`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `scenario` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Name` text,
+  `Data` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Flags` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Type` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `scenario_locale`
+--
+
+DROP TABLE IF EXISTS `scenario_locale`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `scenario_locale` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `locale` varchar(4) NOT NULL,
+  `Name_lang` text,
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`,`locale`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `scenario_step`
+--
+
+DROP TABLE IF EXISTS `scenario_step`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `scenario_step` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Description` text,
+  `Name` text,
+  `CriteriaTreeID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `ScenarioID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `PreviousStepID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `QuestRewardID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `Step` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Flags` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `BonusRequiredStepID` int(10) unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `scenario_step_locale`
+--
+
+DROP TABLE IF EXISTS `scenario_step_locale`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `scenario_step_locale` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `locale` varchar(4) NOT NULL,
+  `Description_lang` text,
+  `Name_lang` text,
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`,`locale`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `scene_script`
 --
 
@@ -4659,10 +4786,10 @@ CREATE TABLE `skill_line` (
   `DisplayName` text,
   `Description` text,
   `AlternateVerb` text,
-  `SpellIconID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `Flags` smallint(5) unsigned NOT NULL DEFAULT '0',
   `CategoryID` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `CanLink` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `IconFileDataID` int(10) unsigned NOT NULL DEFAULT '0',
   `ParentSkillLineID` int(10) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
@@ -4681,7 +4808,6 @@ CREATE TABLE `skill_line_ability` (
   `SpellID` int(10) unsigned NOT NULL DEFAULT '0',
   `RaceMask` int(10) unsigned NOT NULL DEFAULT '0',
   `SupercedesSpell` int(10) unsigned NOT NULL DEFAULT '0',
-  `Unknown703` int(10) unsigned NOT NULL DEFAULT '0',
   `SkillLine` smallint(5) unsigned NOT NULL DEFAULT '0',
   `MinSkillLineRank` smallint(5) unsigned NOT NULL DEFAULT '0',
   `TrivialSkillLineRankHigh` smallint(5) unsigned NOT NULL DEFAULT '0',
@@ -4690,6 +4816,7 @@ CREATE TABLE `skill_line_ability` (
   `TradeSkillCategoryID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `AcquireMethod` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `NumSkillUps` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Unknown703` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `ClassMask` int(11) NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
@@ -5030,7 +5157,7 @@ CREATE TABLE `spell_duration` (
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
   `Duration` int(11) NOT NULL DEFAULT '0',
   `MaxDuration` int(11) NOT NULL DEFAULT '0',
-  `DurationPerLevel` smallint(6) NOT NULL DEFAULT '0',
+  `DurationPerLevel` int(11) NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -5044,37 +5171,38 @@ DROP TABLE IF EXISTS `spell_effect`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `spell_effect` (
-  `EffectAmplitude` float NOT NULL DEFAULT '0',
-  `EffectBonusCoefficient` float NOT NULL DEFAULT '0',
-  `EffectChainAmplitude` float NOT NULL DEFAULT '0',
-  `EffectPointsPerResource` float NOT NULL DEFAULT '0',
-  `EffectRealPointsPerLevel` float NOT NULL DEFAULT '0',
   `EffectSpellClassMask1` int(10) unsigned NOT NULL DEFAULT '0',
   `EffectSpellClassMask2` int(10) unsigned NOT NULL DEFAULT '0',
   `EffectSpellClassMask3` int(10) unsigned NOT NULL DEFAULT '0',
   `EffectSpellClassMask4` int(10) unsigned NOT NULL DEFAULT '0',
-  `EffectPosFacing` float NOT NULL DEFAULT '0',
-  `BonusCoefficientFromAP` float NOT NULL DEFAULT '0',
   `ID` int(10) unsigned NOT NULL DEFAULT '0',
-  `DifficultyID` int(10) unsigned NOT NULL DEFAULT '0',
+  `SpellID` int(10) unsigned NOT NULL DEFAULT '0',
   `Effect` int(10) unsigned NOT NULL DEFAULT '0',
   `EffectAura` int(10) unsigned NOT NULL DEFAULT '0',
-  `EffectAuraPeriod` int(10) unsigned NOT NULL DEFAULT '0',
   `EffectBasePoints` int(11) NOT NULL DEFAULT '0',
-  `EffectChainTargets` int(10) unsigned NOT NULL DEFAULT '0',
-  `EffectDieSides` int(11) NOT NULL DEFAULT '0',
-  `EffectItemType` int(10) unsigned NOT NULL DEFAULT '0',
-  `EffectMechanic` int(10) unsigned NOT NULL DEFAULT '0',
+  `EffectIndex` int(10) unsigned NOT NULL DEFAULT '0',
   `EffectMiscValue` int(11) NOT NULL DEFAULT '0',
   `EffectMiscValueB` int(11) NOT NULL DEFAULT '0',
   `EffectRadiusIndex` int(10) unsigned NOT NULL DEFAULT '0',
   `EffectRadiusMaxIndex` int(10) unsigned NOT NULL DEFAULT '0',
-  `EffectTriggerSpell` int(10) unsigned NOT NULL DEFAULT '0',
   `ImplicitTarget1` int(10) unsigned NOT NULL DEFAULT '0',
   `ImplicitTarget2` int(10) unsigned NOT NULL DEFAULT '0',
-  `SpellID` int(10) unsigned NOT NULL DEFAULT '0',
-  `EffectIndex` int(10) unsigned NOT NULL DEFAULT '0',
+  `DifficultyID` int(10) unsigned NOT NULL DEFAULT '0',
+  `EffectAmplitude` float NOT NULL DEFAULT '0',
+  `EffectAuraPeriod` int(10) unsigned NOT NULL DEFAULT '0',
+  `EffectBonusCoefficient` float NOT NULL DEFAULT '0',
+  `EffectChainAmplitude` float NOT NULL DEFAULT '0',
+  `EffectChainTargets` int(10) unsigned NOT NULL DEFAULT '0',
+  `EffectDieSides` int(11) NOT NULL DEFAULT '0',
+  `EffectItemType` int(10) unsigned NOT NULL DEFAULT '0',
+  `EffectMechanic` int(10) unsigned NOT NULL DEFAULT '0',
+  `EffectPointsPerResource` float NOT NULL DEFAULT '0',
+  `EffectRealPointsPerLevel` float NOT NULL DEFAULT '0',
+  `EffectTriggerSpell` int(10) unsigned NOT NULL DEFAULT '0',
+  `EffectPosFacing` float NOT NULL DEFAULT '0',
   `EffectAttributes` int(10) unsigned NOT NULL DEFAULT '0',
+  `BonusCoefficientFromAP` float NOT NULL DEFAULT '0',
+  `PvPMultiplier` float NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -5369,9 +5497,9 @@ CREATE TABLE `spell_misc` (
   `CastingTimeIndex` smallint(5) unsigned NOT NULL DEFAULT '0',
   `DurationIndex` smallint(5) unsigned NOT NULL DEFAULT '0',
   `RangeIndex` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `SpellIconID` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `ActiveIconID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `SchoolMask` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `IconFileDataID` int(10) unsigned NOT NULL DEFAULT '0',
+  `ActiveIconFileDataID` int(10) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -5592,23 +5720,23 @@ CREATE TABLE `spell_shapeshift_form` (
   `Name` text,
   `WeaponDamageVariance` float NOT NULL DEFAULT '0',
   `Flags` int(10) unsigned NOT NULL DEFAULT '0',
-  `AttackIconID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `CombatRoundTime` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `CreatureDisplayID1` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `CreatureDisplayID2` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `CreatureDisplayID3` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `CreatureDisplayID4` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `PresetSpellID1` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `PresetSpellID2` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `PresetSpellID3` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `PresetSpellID4` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `PresetSpellID5` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `PresetSpellID6` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `PresetSpellID7` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `PresetSpellID8` smallint(5) unsigned NOT NULL DEFAULT '0',
   `MountTypeID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `CreatureType` tinyint(4) NOT NULL DEFAULT '0',
   `BonusActionBar` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `AttackIconFileDataID` int(10) unsigned NOT NULL DEFAULT '0',
+  `CreatureDisplayID1` int(10) unsigned NOT NULL DEFAULT '0',
+  `CreatureDisplayID2` int(10) unsigned NOT NULL DEFAULT '0',
+  `CreatureDisplayID3` int(10) unsigned NOT NULL DEFAULT '0',
+  `CreatureDisplayID4` int(10) unsigned NOT NULL DEFAULT '0',
+  `PresetSpellID1` int(10) unsigned NOT NULL DEFAULT '0',
+  `PresetSpellID2` int(10) unsigned NOT NULL DEFAULT '0',
+  `PresetSpellID3` int(10) unsigned NOT NULL DEFAULT '0',
+  `PresetSpellID4` int(10) unsigned NOT NULL DEFAULT '0',
+  `PresetSpellID5` int(10) unsigned NOT NULL DEFAULT '0',
+  `PresetSpellID6` int(10) unsigned NOT NULL DEFAULT '0',
+  `PresetSpellID7` int(10) unsigned NOT NULL DEFAULT '0',
+  `PresetSpellID8` int(10) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -5680,13 +5808,18 @@ DROP TABLE IF EXISTS `spell_x_spell_visual`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `spell_x_spell_visual` (
   `SpellID` int(10) unsigned NOT NULL DEFAULT '0',
-  `Unk620` float NOT NULL DEFAULT '0',
-  `SpellVisualID1` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `SpellVisualID2` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `SpellVisualID` int(10) unsigned NOT NULL DEFAULT '0',
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Chance` float NOT NULL DEFAULT '0',
+  `CasterPlayerConditionID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `CasterUnitConditionID` smallint(5) unsigned NOT NULL DEFAULT '0',
   `PlayerConditionID` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `DifficultyID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `UnitConditionID` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `IconFileDataID` int(10) unsigned NOT NULL DEFAULT '0',
+  `ActiveIconFileDataID` int(10) unsigned NOT NULL DEFAULT '0',
   `Flags` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `DifficultyID` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Priority` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -6372,4 +6505,4 @@ CREATE TABLE `world_safe_locs_locale` (
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2016-10-16 17:35:49
+-- Dump completed on 2017-04-19  0:03:47
diff --git a/sql/base/dev/world_database.sql b/sql/base/dev/world_database.sql
index c9eab04e25e..d601f8518c0 100644
--- a/sql/base/dev/world_database.sql
+++ b/sql/base/dev/world_database.sql
@@ -1,6 +1,6 @@
 -- MySQL dump 10.16  Distrib 10.1.6-MariaDB, for Win64 (AMD64)
 --
--- Host: localhost    Database: world6
+-- Host: localhost    Database: world
 -- ------------------------------------------------------
 -- Server version	5.7.14-log
 
@@ -136,6 +136,64 @@ CREATE TABLE `areatrigger_teleport` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `areatrigger_template`
+--
+
+DROP TABLE IF EXISTS `areatrigger_template`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `areatrigger_template` (
+  `Id` int(10) 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',
+  `Data1` float NOT NULL DEFAULT '0',
+  `Data2` float NOT NULL DEFAULT '0',
+  `Data3` float NOT NULL DEFAULT '0',
+  `Data4` float NOT NULL DEFAULT '0',
+  `Data5` float NOT NULL DEFAULT '0',
+  `ScriptName` char(64) NOT NULL DEFAULT '',
+  `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 `areatrigger_template_actions`
+--
+
+DROP TABLE IF EXISTS `areatrigger_template_actions`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `areatrigger_template_actions` (
+  `AreaTriggerId` int(10) 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`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `areatrigger_template_polygon_vertices`
+--
+
+DROP TABLE IF EXISTS `areatrigger_template_polygon_vertices`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `areatrigger_template_polygon_vertices` (
+  `AreaTriggerId` int(10) unsigned NOT NULL,
+  `Idx` int(10) unsigned NOT NULL,
+  `VerticeX` float NOT NULL DEFAULT '0',
+  `VerticeY` float NOT NULL DEFAULT '0',
+  `VerticeTargetX` float DEFAULT NULL,
+  `VerticeTargetY` float DEFAULT NULL,
+  `VerifiedBuild` int(10) unsigned NOT NULL DEFAULT '0',
+  PRIMARY KEY (`AreaTriggerId`,`Idx`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `battle_pet_breeds`
 --
 
@@ -221,6 +279,37 @@ CREATE TABLE `blackmarket_template` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `character_template`
+--
+
+DROP TABLE IF EXISTS `character_template`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `character_template` (
+  `Id` int(10) unsigned NOT NULL,
+  `Name` varchar(70) NOT NULL,
+  `Description` varchar(100) NOT NULL,
+  `Level` tinyint(3) unsigned NOT NULL DEFAULT '1',
+  PRIMARY KEY (`Id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `character_template_class`
+--
+
+DROP TABLE IF EXISTS `character_template_class`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `character_template_class` (
+  `TemplateId` int(10) unsigned NOT NULL,
+  `FactionGroup` tinyint(3) unsigned NOT NULL COMMENT '3 - Alliance, 5 - Horde',
+  `Class` tinyint(3) unsigned NOT NULL,
+  PRIMARY KEY (`TemplateId`,`FactionGroup`,`Class`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `class_expansion_requirement`
 --
 
@@ -307,6 +396,7 @@ CREATE TABLE `creature` (
   `npcflag` bigint(20) unsigned NOT NULL DEFAULT '0',
   `unit_flags` int(10) unsigned NOT NULL DEFAULT '0',
   `dynamicflags` int(10) unsigned NOT NULL DEFAULT '0',
+  `ScriptName` char(64) DEFAULT '',
   `VerifiedBuild` smallint(5) DEFAULT '0',
   PRIMARY KEY (`guid`),
   KEY `idx_map` (`map`),
@@ -372,8 +462,14 @@ CREATE TABLE `creature_equip_template` (
   `CreatureID` mediumint(8) unsigned NOT NULL DEFAULT '0',
   `ID` tinyint(3) unsigned NOT NULL DEFAULT '1',
   `ItemID1` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `AppearanceModID1` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `ItemVisual1` smallint(5) unsigned NOT NULL DEFAULT '0',
   `ItemID2` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `AppearanceModID2` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `ItemVisual2` smallint(5) unsigned NOT NULL DEFAULT '0',
   `ItemID3` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `AppearanceModID3` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `ItemVisual3` smallint(5) unsigned NOT NULL DEFAULT '0',
   `VerifiedBuild` smallint(5) DEFAULT '0',
   PRIMARY KEY (`CreatureID`,`ID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
@@ -1049,7 +1145,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=1575 DEFAULT CHARSET=utf8 COMMENT='Tele Command';
+) ENGINE=MyISAM AUTO_INCREMENT=1584 DEFAULT CHARSET=utf8 COMMENT='Tele Command';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
@@ -1105,6 +1201,7 @@ CREATE TABLE `gameobject` (
   `spawntimesecs` int(11) NOT NULL DEFAULT '0',
   `animprogress` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `state` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `ScriptName` char(64) DEFAULT '',
   `VerifiedBuild` smallint(5) DEFAULT '0',
   PRIMARY KEY (`guid`)
 ) ENGINE=MyISAM AUTO_INCREMENT=255094 DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Gameobject System';
@@ -1119,6 +1216,10 @@ DROP TABLE IF EXISTS `gameobject_addon`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `gameobject_addon` (
   `guid` bigint(20) unsigned NOT NULL DEFAULT '0',
+  `parent_rotation0` float NOT NULL DEFAULT '0',
+  `parent_rotation1` float NOT NULL DEFAULT '0',
+  `parent_rotation2` float NOT NULL DEFAULT '0',
+  `parent_rotation3` float NOT NULL DEFAULT '1',
   `invisibilityType` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `invisibilityValue` int(10) unsigned NOT NULL DEFAULT '0',
   PRIMARY KEY (`guid`)
@@ -1333,6 +1434,7 @@ DROP TABLE IF EXISTS `gossip_menu`;
 CREATE TABLE `gossip_menu` (
   `entry` smallint(5) unsigned NOT NULL DEFAULT '0',
   `text_id` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(5) NOT NULL DEFAULT '0',
   PRIMARY KEY (`entry`,`text_id`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -1358,6 +1460,7 @@ CREATE TABLE `gossip_menu_option` (
   `box_money` int(10) unsigned NOT NULL DEFAULT '0',
   `box_text` text,
   `BoxBroadcastTextID` mediumint(6) NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(5) NOT NULL DEFAULT '0',
   PRIMARY KEY (`menu_id`,`id`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -1449,10 +1552,11 @@ DROP TABLE IF EXISTS `item_enchantment_template`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `item_enchantment_template` (
-  `entry` mediumint(8) unsigned NOT NULL DEFAULT '0',
-  `ench` mediumint(8) unsigned NOT NULL DEFAULT '0',
+  `entry` int(10) unsigned NOT NULL DEFAULT '0',
+  `type` tinyint(3) unsigned NOT NULL,
+  `ench` int(10) unsigned NOT NULL DEFAULT '0',
   `chance` float unsigned NOT NULL DEFAULT '0',
-  PRIMARY KEY (`entry`,`ench`)
+  PRIMARY KEY (`entry`,`type`,`ench`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Item Random Enchantment System';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -1777,6 +1881,7 @@ CREATE TABLE `npc_trainer` (
   `ReqSkillLine` smallint(5) unsigned NOT NULL DEFAULT '0',
   `ReqSkillRank` smallint(5) unsigned NOT NULL DEFAULT '0',
   `ReqLevel` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `Index` tinyint(3) NOT NULL DEFAULT '0',
   PRIMARY KEY (`ID`,`SpellID`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -2318,6 +2423,20 @@ CREATE TABLE `quest_greeting` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `quest_mail_sender`
+--
+
+DROP TABLE IF EXISTS `quest_mail_sender`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `quest_mail_sender` (
+  `QuestId` int(5) unsigned NOT NULL DEFAULT '0',
+  `RewardMailSenderEntry` int(5) unsigned NOT NULL DEFAULT '0',
+  PRIMARY KEY (`QuestId`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `quest_objectives`
 --
 
@@ -2332,6 +2451,7 @@ CREATE TABLE `quest_objectives` (
   `ObjectID` int(10) NOT NULL DEFAULT '0',
   `Amount` int(10) NOT NULL DEFAULT '0',
   `Flags` int(10) unsigned NOT NULL DEFAULT '0',
+  `Flags2` int(10) unsigned NOT NULL DEFAULT '0',
   `ProgressBarWeight` float NOT NULL DEFAULT '0',
   `Description` text,
   `VerifiedBuild` smallint(5) NOT NULL DEFAULT '0',
@@ -2381,6 +2501,22 @@ CREATE TABLE `quest_offer_reward` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `quest_offer_reward_locale`
+--
+
+DROP TABLE IF EXISTS `quest_offer_reward_locale`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `quest_offer_reward_locale` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `locale` varchar(4) NOT NULL,
+  `RewardText` text,
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`,`locale`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `quest_poi`
 --
 
@@ -2447,6 +2583,22 @@ CREATE TABLE `quest_request_items` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `quest_request_items_locale`
+--
+
+DROP TABLE IF EXISTS `quest_request_items_locale`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `quest_request_items_locale` (
+  `ID` int(10) unsigned NOT NULL DEFAULT '0',
+  `locale` varchar(4) NOT NULL,
+  `CompletionText` text,
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ID`,`locale`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `quest_template`
 --
 
@@ -2560,6 +2712,7 @@ CREATE TABLE `quest_template` (
   `TimeAllowed` int(10) unsigned NOT NULL DEFAULT '0',
   `AllowableRaces` int(11) NOT NULL DEFAULT '-1',
   `QuestRewardID` int(10) unsigned NOT NULL DEFAULT '0',
+  `Expansion` int(11) NOT NULL DEFAULT '0',
   `LogTitle` text,
   `LogDescription` text,
   `QuestDescription` text,
@@ -2728,6 +2881,65 @@ CREATE TABLE `reputation_spillover_template` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `scenario_poi`
+--
+
+DROP TABLE IF EXISTS `scenario_poi`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `scenario_poi` (
+  `CriteriaTreeID` int(11) NOT NULL DEFAULT '0',
+  `BlobIndex` int(11) NOT NULL DEFAULT '0',
+  `Idx1` int(11) NOT NULL DEFAULT '0',
+  `MapID` int(11) NOT NULL DEFAULT '0',
+  `WorldMapAreaId` int(11) NOT NULL DEFAULT '0',
+  `Floor` int(11) NOT NULL DEFAULT '0',
+  `Priority` int(11) NOT NULL DEFAULT '0',
+  `Flags` int(11) NOT NULL DEFAULT '0',
+  `WorldEffectID` int(11) NOT NULL DEFAULT '0',
+  `PlayerConditionID` int(11) NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(5) DEFAULT '0',
+  PRIMARY KEY (`CriteriaTreeID`,`BlobIndex`,`Idx1`),
+  KEY `idx` (`CriteriaTreeID`,`BlobIndex`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `scenario_poi_points`
+--
+
+DROP TABLE IF EXISTS `scenario_poi_points`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `scenario_poi_points` (
+  `CriteriaTreeID` int(11) NOT NULL DEFAULT '0',
+  `Idx1` int(11) NOT NULL DEFAULT '0',
+  `Idx2` int(11) NOT NULL DEFAULT '0',
+  `X` int(11) NOT NULL DEFAULT '0',
+  `Y` int(11) NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(5) DEFAULT '0',
+  PRIMARY KEY (`CriteriaTreeID`,`Idx1`,`Idx2`),
+  KEY `questId_id` (`CriteriaTreeID`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `scenarios`
+--
+
+DROP TABLE IF EXISTS `scenarios`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `scenarios` (
+  `map` int(10) unsigned NOT NULL DEFAULT '0',
+  `difficulty` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `scenario_A` int(10) unsigned NOT NULL DEFAULT '0',
+  `scenario_H` int(10) unsigned NOT NULL DEFAULT '0',
+  PRIMARY KEY (`map`,`difficulty`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `scene_template`
 --
 
@@ -2744,6 +2956,42 @@ CREATE TABLE `scene_template` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `script_spline_chain_meta`
+--
+
+DROP TABLE IF EXISTS `script_spline_chain_meta`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `script_spline_chain_meta` (
+  `entry` int(10) unsigned NOT NULL,
+  `chainId` smallint(5) unsigned NOT NULL,
+  `splineId` tinyint(3) unsigned NOT NULL,
+  `expectedDuration` int(10) unsigned NOT NULL,
+  `msUntilNext` int(10) unsigned NOT NULL,
+  PRIMARY KEY (`entry`,`chainId`,`splineId`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `script_spline_chain_waypoints`
+--
+
+DROP TABLE IF EXISTS `script_spline_chain_waypoints`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `script_spline_chain_waypoints` (
+  `entry` int(10) unsigned NOT NULL,
+  `chainId` smallint(5) unsigned NOT NULL,
+  `splineId` tinyint(3) unsigned NOT NULL,
+  `wpId` tinyint(3) unsigned NOT NULL,
+  `x` float NOT NULL,
+  `y` float NOT NULL,
+  `z` float NOT NULL,
+  PRIMARY KEY (`entry`,`chainId`,`splineId`,`wpId`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `script_waypoint`
 --
 
@@ -2890,11 +3138,12 @@ CREATE TABLE `smart_scripts` (
   `event_type` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `event_phase_mask` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `event_chance` tinyint(3) unsigned NOT NULL DEFAULT '100',
-  `event_flags` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `event_flags` smallint(3) unsigned NOT NULL DEFAULT '0',
   `event_param1` int(10) unsigned NOT NULL DEFAULT '0',
   `event_param2` int(10) unsigned NOT NULL DEFAULT '0',
   `event_param3` int(10) unsigned NOT NULL DEFAULT '0',
   `event_param4` int(10) unsigned NOT NULL DEFAULT '0',
+  `event_param_string` varchar(255) NOT NULL DEFAULT '',
   `action_type` tinyint(3) unsigned NOT NULL DEFAULT '0',
   `action_param1` int(10) unsigned NOT NULL DEFAULT '0',
   `action_param2` int(10) unsigned NOT NULL DEFAULT '0',
@@ -2938,6 +3187,46 @@ CREATE TABLE `spell_area` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `spell_areatrigger`
+--
+
+DROP TABLE IF EXISTS `spell_areatrigger`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `spell_areatrigger` (
+  `SpellMiscId` int(10) unsigned NOT NULL,
+  `AreaTriggerId` int(10) unsigned NOT NULL,
+  `MoveCurveId` int(10) unsigned NOT NULL DEFAULT '0',
+  `ScaleCurveId` int(10) unsigned NOT NULL DEFAULT '0',
+  `MorphCurveId` int(10) unsigned NOT NULL DEFAULT '0',
+  `FacingCurveId` int(10) unsigned NOT NULL DEFAULT '0',
+  `DecalPropertiesId` int(10) unsigned NOT NULL DEFAULT '0',
+  `TimeToTarget` int(10) unsigned NOT NULL DEFAULT '0',
+  `TimeToTargetScale` int(10) unsigned NOT NULL DEFAULT '0',
+  `VerifiedBuild` int(10) unsigned NOT NULL DEFAULT '0',
+  PRIMARY KEY (`SpellMiscId`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Table structure for table `spell_areatrigger_splines`
+--
+
+DROP TABLE IF EXISTS `spell_areatrigger_splines`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `spell_areatrigger_splines` (
+  `SpellMiscId` int(10) unsigned NOT NULL,
+  `Idx` int(10) unsigned NOT NULL,
+  `X` float NOT NULL DEFAULT '0',
+  `Y` float NOT NULL DEFAULT '0',
+  `Z` float NOT NULL DEFAULT '0',
+  `VerifiedBuild` int(10) unsigned NOT NULL DEFAULT '0',
+  PRIMARY KEY (`SpellMiscId`,`Idx`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `spell_custom_attr`
 --
 
@@ -3109,23 +3398,23 @@ DROP TABLE IF EXISTS `spell_proc`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `spell_proc` (
-  `spellId` mediumint(8) NOT NULL DEFAULT '0',
-  `schoolMask` tinyint(4) NOT NULL DEFAULT '0',
-  `spellFamilyName` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `spellFamilyMask0` int(10) unsigned NOT NULL DEFAULT '0',
-  `spellFamilyMask1` int(10) unsigned NOT NULL DEFAULT '0',
-  `spellFamilyMask2` int(10) unsigned NOT NULL DEFAULT '0',
-  `spellFamilyMask3` int(10) unsigned NOT NULL DEFAULT '0',
-  `typeMask` int(10) unsigned NOT NULL DEFAULT '0',
-  `spellTypeMask` int(10) unsigned NOT NULL DEFAULT '0',
-  `spellPhaseMask` int(11) NOT NULL DEFAULT '0',
-  `hitMask` int(11) NOT NULL DEFAULT '0',
-  `attributesMask` int(10) unsigned NOT NULL DEFAULT '0',
-  `ratePerMinute` float NOT NULL DEFAULT '0',
-  `chance` float NOT NULL DEFAULT '0',
-  `cooldown` float unsigned NOT NULL DEFAULT '0',
-  `charges` int(10) unsigned NOT NULL DEFAULT '0',
-  PRIMARY KEY (`spellId`)
+  `SpellId` int(11) NOT NULL DEFAULT '0',
+  `SchoolMask` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  `SpellFamilyName` smallint(5) unsigned NOT NULL DEFAULT '0',
+  `SpellFamilyMask0` int(10) unsigned NOT NULL DEFAULT '0',
+  `SpellFamilyMask1` int(10) unsigned NOT NULL DEFAULT '0',
+  `SpellFamilyMask2` int(10) unsigned NOT NULL DEFAULT '0',
+  `SpellFamilyMask3` int(10) unsigned NOT NULL DEFAULT '0',
+  `ProcFlags` int(10) unsigned NOT NULL DEFAULT '0',
+  `SpellTypeMask` int(10) unsigned NOT NULL DEFAULT '0',
+  `SpellPhaseMask` int(10) unsigned NOT NULL DEFAULT '0',
+  `HitMask` int(10) unsigned NOT NULL DEFAULT '0',
+  `AttributesMask` int(10) unsigned NOT NULL DEFAULT '0',
+  `ProcsPerMinute` float NOT NULL DEFAULT '0',
+  `Chance` float NOT NULL DEFAULT '0',
+  `Cooldown` int(10) unsigned NOT NULL DEFAULT '0',
+  `Charges` tinyint(3) unsigned NOT NULL DEFAULT '0',
+  PRIMARY KEY (`SpellId`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -3539,4 +3828,4 @@ CREATE TABLE `waypoints` (
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2016-10-16 17:35:48
+-- Dump completed on 2017-04-19  0:03:47
diff --git a/sql/updates/auth/master/2016_10_17_00_auth.sql b/sql/old/7/auth/00_2017_04_18/2016_10_17_00_auth.sql
index 4e3ed5809bf..4e3ed5809bf 100644
--- a/sql/updates/auth/master/2016_10_17_00_auth.sql
+++ b/sql/old/7/auth/00_2017_04_18/2016_10_17_00_auth.sql
diff --git a/sql/updates/auth/master/2016_10_25_00_auth.sql b/sql/old/7/auth/00_2017_04_18/2016_10_25_00_auth.sql
index b9e0e5abd3a..b9e0e5abd3a 100644
--- a/sql/updates/auth/master/2016_10_25_00_auth.sql
+++ b/sql/old/7/auth/00_2017_04_18/2016_10_25_00_auth.sql
diff --git a/sql/updates/auth/master/2016_10_28_00_auth.sql b/sql/old/7/auth/00_2017_04_18/2016_10_28_00_auth.sql
index 9e877092c44..9e877092c44 100644
--- a/sql/updates/auth/master/2016_10_28_00_auth.sql
+++ b/sql/old/7/auth/00_2017_04_18/2016_10_28_00_auth.sql
diff --git a/sql/updates/auth/master/2016_11_04_00_auth.sql b/sql/old/7/auth/00_2017_04_18/2016_11_04_00_auth.sql
index 438f5307af5..438f5307af5 100644
--- a/sql/updates/auth/master/2016_11_04_00_auth.sql
+++ b/sql/old/7/auth/00_2017_04_18/2016_11_04_00_auth.sql
diff --git a/sql/updates/auth/master/2016_11_09_00_auth.sql b/sql/old/7/auth/00_2017_04_18/2016_11_09_00_auth.sql
index c2fc4825f09..c2fc4825f09 100644
--- a/sql/updates/auth/master/2016_11_09_00_auth.sql
+++ b/sql/old/7/auth/00_2017_04_18/2016_11_09_00_auth.sql
diff --git a/sql/updates/auth/master/2016_11_17_00_auth.sql b/sql/old/7/auth/00_2017_04_18/2016_11_17_00_auth.sql
index 69d7c5b42f2..69d7c5b42f2 100644
--- a/sql/updates/auth/master/2016_11_17_00_auth.sql
+++ b/sql/old/7/auth/00_2017_04_18/2016_11_17_00_auth.sql
diff --git a/sql/updates/auth/master/2016_12_04_00_auth.sql b/sql/old/7/auth/00_2017_04_18/2016_12_04_00_auth.sql
index 2d697e7f293..2d697e7f293 100644
--- a/sql/updates/auth/master/2016_12_04_00_auth.sql
+++ b/sql/old/7/auth/00_2017_04_18/2016_12_04_00_auth.sql
diff --git a/sql/updates/auth/master/2016_12_11_00_auth.sql b/sql/old/7/auth/00_2017_04_18/2016_12_11_00_auth.sql
index cca5e6db8b6..cca5e6db8b6 100644
--- a/sql/updates/auth/master/2016_12_11_00_auth.sql
+++ b/sql/old/7/auth/00_2017_04_18/2016_12_11_00_auth.sql
diff --git a/sql/updates/auth/master/2016_12_18_00_auth.sql b/sql/old/7/auth/00_2017_04_18/2016_12_18_00_auth.sql
index 2a513fcd146..2a513fcd146 100644
--- a/sql/updates/auth/master/2016_12_18_00_auth.sql
+++ b/sql/old/7/auth/00_2017_04_18/2016_12_18_00_auth.sql
diff --git a/sql/updates/auth/master/2017_01_14_00_auth.sql b/sql/old/7/auth/00_2017_04_18/2017_01_14_00_auth.sql
index 910c1ae3c90..910c1ae3c90 100644
--- a/sql/updates/auth/master/2017_01_14_00_auth.sql
+++ b/sql/old/7/auth/00_2017_04_18/2017_01_14_00_auth.sql
diff --git a/sql/updates/auth/master/2017_01_26_00_auth.sql b/sql/old/7/auth/00_2017_04_18/2017_01_26_00_auth.sql
index 4d9bd155040..4d9bd155040 100644
--- a/sql/updates/auth/master/2017_01_26_00_auth.sql
+++ b/sql/old/7/auth/00_2017_04_18/2017_01_26_00_auth.sql
diff --git a/sql/updates/auth/master/2017_01_29_00_auth.sql b/sql/old/7/auth/00_2017_04_18/2017_01_29_00_auth.sql
index 53397d5d880..53397d5d880 100644
--- a/sql/updates/auth/master/2017_01_29_00_auth.sql
+++ b/sql/old/7/auth/00_2017_04_18/2017_01_29_00_auth.sql
diff --git a/sql/updates/auth/master/2017_03_11_00_auth.sql b/sql/old/7/auth/00_2017_04_18/2017_03_11_00_auth.sql
index 4d158f5ed8f..4d158f5ed8f 100644
--- a/sql/updates/auth/master/2017_03_11_00_auth.sql
+++ b/sql/old/7/auth/00_2017_04_18/2017_03_11_00_auth.sql
diff --git a/sql/updates/auth/master/2017_03_17_00_auth.sql b/sql/old/7/auth/00_2017_04_18/2017_03_17_00_auth.sql
index 3c0f547fcbe..3c0f547fcbe 100644
--- a/sql/updates/auth/master/2017_03_17_00_auth.sql
+++ b/sql/old/7/auth/00_2017_04_18/2017_03_17_00_auth.sql
diff --git a/sql/updates/auth/master/2017_04_17_00_auth.sql b/sql/old/7/auth/00_2017_04_18/2017_04_17_00_auth.sql
index f4f5af9acec..f4f5af9acec 100644
--- a/sql/updates/auth/master/2017_04_17_00_auth.sql
+++ b/sql/old/7/auth/00_2017_04_18/2017_04_17_00_auth.sql
diff --git a/sql/updates/characters/master/2016_10_17_00_characters.sql b/sql/old/7/characters/00_2017_04_18/2016_10_17_00_characters.sql
index 4e3ed5809bf..4e3ed5809bf 100644
--- a/sql/updates/characters/master/2016_10_17_00_characters.sql
+++ b/sql/old/7/characters/00_2017_04_18/2016_10_17_00_characters.sql
diff --git a/sql/updates/characters/master/2016_10_25_00_characters.sql b/sql/old/7/characters/00_2017_04_18/2016_10_25_00_characters.sql
index 3396c3e0a4b..3396c3e0a4b 100644
--- a/sql/updates/characters/master/2016_10_25_00_characters.sql
+++ b/sql/old/7/characters/00_2017_04_18/2016_10_25_00_characters.sql
diff --git a/sql/updates/characters/master/2016_11_06_00_characters.sql b/sql/old/7/characters/00_2017_04_18/2016_11_06_00_characters.sql
index 1b4f22e24e7..1b4f22e24e7 100644
--- a/sql/updates/characters/master/2016_11_06_00_characters.sql
+++ b/sql/old/7/characters/00_2017_04_18/2016_11_06_00_characters.sql
diff --git a/sql/updates/characters/master/2016_12_09_00_characters.sql b/sql/old/7/characters/00_2017_04_18/2016_12_09_00_characters.sql
index 5cf06fde71c..5cf06fde71c 100644
--- a/sql/updates/characters/master/2016_12_09_00_characters.sql
+++ b/sql/old/7/characters/00_2017_04_18/2016_12_09_00_characters.sql
diff --git a/sql/updates/characters/master/2016_12_26_00_characters.sql b/sql/old/7/characters/00_2017_04_18/2016_12_26_00_characters.sql
index 3db177be92a..3db177be92a 100644
--- a/sql/updates/characters/master/2016_12_26_00_characters.sql
+++ b/sql/old/7/characters/00_2017_04_18/2016_12_26_00_characters.sql
diff --git a/sql/updates/characters/master/2017_01_22_00_characters.sql b/sql/old/7/characters/00_2017_04_18/2017_01_22_00_characters.sql
index e89c3e3593b..e89c3e3593b 100644
--- a/sql/updates/characters/master/2017_01_22_00_characters.sql
+++ b/sql/old/7/characters/00_2017_04_18/2017_01_22_00_characters.sql
diff --git a/sql/updates/characters/master/2017_01_29_00_characters.sql b/sql/old/7/characters/00_2017_04_18/2017_01_29_00_characters.sql
index b7cb4126ccd..b7cb4126ccd 100644
--- a/sql/updates/characters/master/2017_01_29_00_characters.sql
+++ b/sql/old/7/characters/00_2017_04_18/2017_01_29_00_characters.sql
diff --git a/sql/updates/characters/master/2017_02_26_00_characters_2016_09_13_00_characters.sql b/sql/old/7/characters/00_2017_04_18/2017_02_26_00_characters_2016_09_13_00_characters.sql
index f165cc76d26..f165cc76d26 100644
--- a/sql/updates/characters/master/2017_02_26_00_characters_2016_09_13_00_characters.sql
+++ b/sql/old/7/characters/00_2017_04_18/2017_02_26_00_characters_2016_09_13_00_characters.sql
diff --git a/sql/updates/characters/master/2017_04_15_00_characters.sql b/sql/old/7/characters/00_2017_04_18/2017_04_15_00_characters.sql
index 9280c349383..9280c349383 100644
--- a/sql/updates/characters/master/2017_04_15_00_characters.sql
+++ b/sql/old/7/characters/00_2017_04_18/2017_04_15_00_characters.sql
diff --git a/sql/updates/hotfixes/master/2016_10_17_00_hotfixes.sql b/sql/old/7/hotfixes/00_2017_04_18/2016_10_17_00_hotfixes.sql
index 4e3ed5809bf..4e3ed5809bf 100644
--- a/sql/updates/hotfixes/master/2016_10_17_00_hotfixes.sql
+++ b/sql/old/7/hotfixes/00_2017_04_18/2016_10_17_00_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2016_10_26_00_hotfixes.sql b/sql/old/7/hotfixes/00_2017_04_18/2016_10_26_00_hotfixes.sql
index c05f6eba2b8..c05f6eba2b8 100644
--- a/sql/updates/hotfixes/master/2016_10_26_00_hotfixes.sql
+++ b/sql/old/7/hotfixes/00_2017_04_18/2016_10_26_00_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2016_11_01_00_hotfixes.sql b/sql/old/7/hotfixes/00_2017_04_18/2016_11_01_00_hotfixes.sql
index ed454a89cf1..ed454a89cf1 100644
--- a/sql/updates/hotfixes/master/2016_11_01_00_hotfixes.sql
+++ b/sql/old/7/hotfixes/00_2017_04_18/2016_11_01_00_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2016_11_06_00_hotfixes.sql b/sql/old/7/hotfixes/00_2017_04_18/2016_11_06_00_hotfixes.sql
index 9dbaa9ddee4..9dbaa9ddee4 100644
--- a/sql/updates/hotfixes/master/2016_11_06_00_hotfixes.sql
+++ b/sql/old/7/hotfixes/00_2017_04_18/2016_11_06_00_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2016_11_06_01_hotfixes.sql b/sql/old/7/hotfixes/00_2017_04_18/2016_11_06_01_hotfixes.sql
index 8824ccbf81a..8824ccbf81a 100644
--- a/sql/updates/hotfixes/master/2016_11_06_01_hotfixes.sql
+++ b/sql/old/7/hotfixes/00_2017_04_18/2016_11_06_01_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2016_11_06_02_hotfixes.sql b/sql/old/7/hotfixes/00_2017_04_18/2016_11_06_02_hotfixes.sql
index fae5062d5fc..fae5062d5fc 100644
--- a/sql/updates/hotfixes/master/2016_11_06_02_hotfixes.sql
+++ b/sql/old/7/hotfixes/00_2017_04_18/2016_11_06_02_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2016_12_20_00_hotfixes.sql b/sql/old/7/hotfixes/00_2017_04_18/2016_12_20_00_hotfixes.sql
index 671de675a36..671de675a36 100644
--- a/sql/updates/hotfixes/master/2016_12_20_00_hotfixes.sql
+++ b/sql/old/7/hotfixes/00_2017_04_18/2016_12_20_00_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2017_01_14_00_hotfixes.sql b/sql/old/7/hotfixes/00_2017_04_18/2017_01_14_00_hotfixes.sql
index 49bc8ed651f..49bc8ed651f 100644
--- a/sql/updates/hotfixes/master/2017_01_14_00_hotfixes.sql
+++ b/sql/old/7/hotfixes/00_2017_04_18/2017_01_14_00_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2017_02_04_00_hotfixes.sql b/sql/old/7/hotfixes/00_2017_04_18/2017_02_04_00_hotfixes.sql
index dd92e1b2358..dd92e1b2358 100644
--- a/sql/updates/hotfixes/master/2017_02_04_00_hotfixes.sql
+++ b/sql/old/7/hotfixes/00_2017_04_18/2017_02_04_00_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2017_02_18_00_hotfixes.sql b/sql/old/7/hotfixes/00_2017_04_18/2017_02_18_00_hotfixes.sql
index 2c814698f2b..2c814698f2b 100644
--- a/sql/updates/hotfixes/master/2017_02_18_00_hotfixes.sql
+++ b/sql/old/7/hotfixes/00_2017_04_18/2017_02_18_00_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2017_02_25_00_hotfixes.sql b/sql/old/7/hotfixes/00_2017_04_18/2017_02_25_00_hotfixes.sql
index 6947bc808b3..6947bc808b3 100644
--- a/sql/updates/hotfixes/master/2017_02_25_00_hotfixes.sql
+++ b/sql/old/7/hotfixes/00_2017_04_18/2017_02_25_00_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2017_04_06_00_hotfixes.sql b/sql/old/7/hotfixes/00_2017_04_18/2017_04_06_00_hotfixes.sql
index 79823456614..79823456614 100644
--- a/sql/updates/hotfixes/master/2017_04_06_00_hotfixes.sql
+++ b/sql/old/7/hotfixes/00_2017_04_18/2017_04_06_00_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2017_04_15_00_hotfixes.sql b/sql/old/7/hotfixes/00_2017_04_18/2017_04_15_00_hotfixes.sql
index 43ee10bab8e..43ee10bab8e 100644
--- a/sql/updates/hotfixes/master/2017_04_15_00_hotfixes.sql
+++ b/sql/old/7/hotfixes/00_2017_04_18/2017_04_15_00_hotfixes.sql
diff --git a/sql/updates/hotfixes/master/2017_04_16_00_hotfixes.sql b/sql/old/7/hotfixes/00_2017_04_18/2017_04_16_00_hotfixes.sql
index 6dec749e17e..6dec749e17e 100644
--- a/sql/updates/hotfixes/master/2017_04_16_00_hotfixes.sql
+++ b/sql/old/7/hotfixes/00_2017_04_18/2017_04_16_00_hotfixes.sql
diff --git a/sql/updates/world/master/2016_10_17_00_world.sql b/sql/old/7/world/00_2017_04_18/2016_10_17_00_world.sql
index ed811f52fd7..ed811f52fd7 100644
--- a/sql/updates/world/master/2016_10_17_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2016_10_17_00_world.sql
diff --git a/sql/updates/world/master/2016_10_17_01_world.sql b/sql/old/7/world/00_2017_04_18/2016_10_17_01_world.sql
index 969c69c846c..969c69c846c 100644
--- a/sql/updates/world/master/2016_10_17_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2016_10_17_01_world.sql
diff --git a/sql/updates/world/master/2016_10_17_02_world.sql b/sql/old/7/world/00_2017_04_18/2016_10_17_02_world.sql
index ed9c9768e49..ed9c9768e49 100644
--- a/sql/updates/world/master/2016_10_17_02_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2016_10_17_02_world.sql
diff --git a/sql/updates/world/master/2016_10_22_00_world.sql b/sql/old/7/world/00_2017_04_18/2016_10_22_00_world.sql
index 8fb4d5b370b..8fb4d5b370b 100644
--- a/sql/updates/world/master/2016_10_22_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2016_10_22_00_world.sql
diff --git a/sql/updates/world/master/2016_10_22_01_world.sql b/sql/old/7/world/00_2017_04_18/2016_10_22_01_world.sql
index fb88ffed5ef..fb88ffed5ef 100644
--- a/sql/updates/world/master/2016_10_22_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2016_10_22_01_world.sql
diff --git a/sql/updates/world/master/2016_10_23_00_world.sql b/sql/old/7/world/00_2017_04_18/2016_10_23_00_world.sql
index 4468795e94b..4468795e94b 100644
--- a/sql/updates/world/master/2016_10_23_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2016_10_23_00_world.sql
diff --git a/sql/updates/world/master/2016_10_23_01_world.sql b/sql/old/7/world/00_2017_04_18/2016_10_23_01_world.sql
index 5db0d726031..5db0d726031 100644
--- a/sql/updates/world/master/2016_10_23_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2016_10_23_01_world.sql
diff --git a/sql/updates/world/master/2016_10_24_00_world.sql b/sql/old/7/world/00_2017_04_18/2016_10_24_00_world.sql
index cff7e9e6c42..cff7e9e6c42 100644
--- a/sql/updates/world/master/2016_10_24_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2016_10_24_00_world.sql
diff --git a/sql/updates/world/master/2016_10_25_00_world.sql b/sql/old/7/world/00_2017_04_18/2016_10_25_00_world.sql
index 305da7b6c88..305da7b6c88 100644
--- a/sql/updates/world/master/2016_10_25_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2016_10_25_00_world.sql
diff --git a/sql/updates/world/master/2016_10_30_00_world.sql b/sql/old/7/world/00_2017_04_18/2016_10_30_00_world.sql
index 6a9f775afbe..6a9f775afbe 100644
--- a/sql/updates/world/master/2016_10_30_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2016_10_30_00_world.sql
diff --git a/sql/updates/world/master/2016_10_31_00_world.sql b/sql/old/7/world/00_2017_04_18/2016_10_31_00_world.sql
index 21d8b648521..21d8b648521 100644
--- a/sql/updates/world/master/2016_10_31_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2016_10_31_00_world.sql
diff --git a/sql/updates/world/master/2016_11_01_00_world.sql b/sql/old/7/world/00_2017_04_18/2016_11_01_00_world.sql
index 427df99b9c4..427df99b9c4 100644
--- a/sql/updates/world/master/2016_11_01_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2016_11_01_00_world.sql
diff --git a/sql/updates/world/master/2016_11_02_00_world.sql b/sql/old/7/world/00_2017_04_18/2016_11_02_00_world.sql
index e2aac96b590..e2aac96b590 100644
--- a/sql/updates/world/master/2016_11_02_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2016_11_02_00_world.sql
diff --git a/sql/updates/world/master/2016_11_02_01_world.sql b/sql/old/7/world/00_2017_04_18/2016_11_02_01_world.sql
index 3b425262604..3b425262604 100644
--- a/sql/updates/world/master/2016_11_02_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2016_11_02_01_world.sql
diff --git a/sql/updates/world/master/2016_11_05_00_world.sql b/sql/old/7/world/00_2017_04_18/2016_11_05_00_world.sql
index 75414f25a13..75414f25a13 100644
--- a/sql/updates/world/master/2016_11_05_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2016_11_05_00_world.sql
diff --git a/sql/updates/world/master/2016_11_06_00_world.sql b/sql/old/7/world/00_2017_04_18/2016_11_06_00_world.sql
index 4fab752d9e2..4fab752d9e2 100644
--- a/sql/updates/world/master/2016_11_06_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2016_11_06_00_world.sql
diff --git a/sql/updates/world/master/2016_11_12_00_world.sql b/sql/old/7/world/00_2017_04_18/2016_11_12_00_world.sql
index 256585bb570..256585bb570 100644
--- a/sql/updates/world/master/2016_11_12_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2016_11_12_00_world.sql
diff --git a/sql/updates/world/master/2016_11_13_00_world.sql b/sql/old/7/world/00_2017_04_18/2016_11_13_00_world.sql
index fbaff0b9de6..fbaff0b9de6 100644
--- a/sql/updates/world/master/2016_11_13_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2016_11_13_00_world.sql
diff --git a/sql/updates/world/master/2016_11_14_00_world.sql b/sql/old/7/world/00_2017_04_18/2016_11_14_00_world.sql
index 86b2680bdfc..86b2680bdfc 100644
--- a/sql/updates/world/master/2016_11_14_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2016_11_14_00_world.sql
diff --git a/sql/updates/world/master/2016_11_14_01_world.sql b/sql/old/7/world/00_2017_04_18/2016_11_14_01_world.sql
index bd23a3176bd..bd23a3176bd 100644
--- a/sql/updates/world/master/2016_11_14_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2016_11_14_01_world.sql
diff --git a/sql/updates/world/master/2016_11_16_00_world.sql b/sql/old/7/world/00_2017_04_18/2016_11_16_00_world.sql
index 4ecc5a6b253..4ecc5a6b253 100644
--- a/sql/updates/world/master/2016_11_16_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2016_11_16_00_world.sql
diff --git a/sql/updates/world/master/2016_11_20_00_world.sql b/sql/old/7/world/00_2017_04_18/2016_11_20_00_world.sql
index 4d80e589d06..4d80e589d06 100644
--- a/sql/updates/world/master/2016_11_20_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2016_11_20_00_world.sql
diff --git a/sql/updates/world/master/2016_11_21_00_world.sql b/sql/old/7/world/00_2017_04_18/2016_11_21_00_world.sql
index 863b1cf77b9..863b1cf77b9 100644
--- a/sql/updates/world/master/2016_11_21_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2016_11_21_00_world.sql
diff --git a/sql/updates/world/master/2016_11_22_00_world.sql b/sql/old/7/world/00_2017_04_18/2016_11_22_00_world.sql
index b2ee682aba6..b2ee682aba6 100644
--- a/sql/updates/world/master/2016_11_22_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2016_11_22_00_world.sql
diff --git a/sql/updates/world/master/2016_11_26_00_world.sql b/sql/old/7/world/00_2017_04_18/2016_11_26_00_world.sql
index 2b542b7f14b..2b542b7f14b 100644
--- a/sql/updates/world/master/2016_11_26_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2016_11_26_00_world.sql
diff --git a/sql/updates/world/master/2016_11_26_01_world.sql b/sql/old/7/world/00_2017_04_18/2016_11_26_01_world.sql
index a4e7ae4d21a..a4e7ae4d21a 100644
--- a/sql/updates/world/master/2016_11_26_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2016_11_26_01_world.sql
diff --git a/sql/updates/world/master/2016_11_26_02_world.sql b/sql/old/7/world/00_2017_04_18/2016_11_26_02_world.sql
index 2819c094177..2819c094177 100644
--- a/sql/updates/world/master/2016_11_26_02_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2016_11_26_02_world.sql
diff --git a/sql/updates/world/master/2016_11_26_03_world.sql b/sql/old/7/world/00_2017_04_18/2016_11_26_03_world.sql
index afa7ce7387c..afa7ce7387c 100644
--- a/sql/updates/world/master/2016_11_26_03_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2016_11_26_03_world.sql
diff --git a/sql/updates/world/master/2016_11_26_04_world.sql b/sql/old/7/world/00_2017_04_18/2016_11_26_04_world.sql
index 9109f673222..9109f673222 100644
--- a/sql/updates/world/master/2016_11_26_04_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2016_11_26_04_world.sql
diff --git a/sql/updates/world/master/2016_11_27_00_world.sql b/sql/old/7/world/00_2017_04_18/2016_11_27_00_world.sql
index 1bc69656109..1bc69656109 100644
--- a/sql/updates/world/master/2016_11_27_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2016_11_27_00_world.sql
diff --git a/sql/updates/world/master/2016_11_27_01_world.sql b/sql/old/7/world/00_2017_04_18/2016_11_27_01_world.sql
index 5dc8c70dbcd..5dc8c70dbcd 100644
--- a/sql/updates/world/master/2016_11_27_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2016_11_27_01_world.sql
diff --git a/sql/updates/world/master/2016_11_28_00_world.sql b/sql/old/7/world/00_2017_04_18/2016_11_28_00_world.sql
index 4d6948476f4..4d6948476f4 100644
--- a/sql/updates/world/master/2016_11_28_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2016_11_28_00_world.sql
diff --git a/sql/updates/world/master/2016_12_03_00_world.sql b/sql/old/7/world/00_2017_04_18/2016_12_03_00_world.sql
index b74cd92882c..b74cd92882c 100644
--- a/sql/updates/world/master/2016_12_03_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2016_12_03_00_world.sql
diff --git a/sql/updates/world/master/2016_12_06_00_world.sql b/sql/old/7/world/00_2017_04_18/2016_12_06_00_world.sql
index aa9c6329fc3..aa9c6329fc3 100644
--- a/sql/updates/world/master/2016_12_06_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2016_12_06_00_world.sql
diff --git a/sql/updates/world/master/2016_12_06_01_world.sql b/sql/old/7/world/00_2017_04_18/2016_12_06_01_world.sql
index ef702dd5225..ef702dd5225 100644
--- a/sql/updates/world/master/2016_12_06_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2016_12_06_01_world.sql
diff --git a/sql/updates/world/master/2016_12_06_02_world.sql b/sql/old/7/world/00_2017_04_18/2016_12_06_02_world.sql
index f91bd20da70..f91bd20da70 100644
--- a/sql/updates/world/master/2016_12_06_02_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2016_12_06_02_world.sql
diff --git a/sql/updates/world/master/2016_12_07_00_world.sql b/sql/old/7/world/00_2017_04_18/2016_12_07_00_world.sql
index 98d0a8cccbd..98d0a8cccbd 100644
--- a/sql/updates/world/master/2016_12_07_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2016_12_07_00_world.sql
diff --git a/sql/updates/world/master/2016_12_08_00_world.sql b/sql/old/7/world/00_2017_04_18/2016_12_08_00_world.sql
index ee4412fb8c1..ee4412fb8c1 100644
--- a/sql/updates/world/master/2016_12_08_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2016_12_08_00_world.sql
diff --git a/sql/updates/world/master/2016_12_11_00_world.sql b/sql/old/7/world/00_2017_04_18/2016_12_11_00_world.sql
index 06b548a8830..06b548a8830 100644
--- a/sql/updates/world/master/2016_12_11_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2016_12_11_00_world.sql
diff --git a/sql/updates/world/master/2016_12_11_01_world.sql b/sql/old/7/world/00_2017_04_18/2016_12_11_01_world.sql
index c3e490a4eaf..c3e490a4eaf 100644
--- a/sql/updates/world/master/2016_12_11_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2016_12_11_01_world.sql
diff --git a/sql/updates/world/master/2016_12_13_00_world.sql b/sql/old/7/world/00_2017_04_18/2016_12_13_00_world.sql
index 93b28aa61d7..93b28aa61d7 100644
--- a/sql/updates/world/master/2016_12_13_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2016_12_13_00_world.sql
diff --git a/sql/updates/world/master/2016_12_18_00_world.sql b/sql/old/7/world/00_2017_04_18/2016_12_18_00_world.sql
index 8aa931c5d2b..8aa931c5d2b 100644
--- a/sql/updates/world/master/2016_12_18_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2016_12_18_00_world.sql
diff --git a/sql/updates/world/master/2016_12_24_00_world.sql b/sql/old/7/world/00_2017_04_18/2016_12_24_00_world.sql
index 050bd0cf3ce..050bd0cf3ce 100644
--- a/sql/updates/world/master/2016_12_24_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2016_12_24_00_world.sql
diff --git a/sql/updates/world/master/2016_12_24_01_world.sql b/sql/old/7/world/00_2017_04_18/2016_12_24_01_world.sql
index 60e27a5164a..60e27a5164a 100644
--- a/sql/updates/world/master/2016_12_24_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2016_12_24_01_world.sql
diff --git a/sql/updates/world/master/2016_12_24_02_world.sql b/sql/old/7/world/00_2017_04_18/2016_12_24_02_world.sql
index a1df21ee305..a1df21ee305 100644
--- a/sql/updates/world/master/2016_12_24_02_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2016_12_24_02_world.sql
diff --git a/sql/updates/world/master/2016_12_24_03_world.sql b/sql/old/7/world/00_2017_04_18/2016_12_24_03_world.sql
index 61d1e489ae4..61d1e489ae4 100644
--- a/sql/updates/world/master/2016_12_24_03_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2016_12_24_03_world.sql
diff --git a/sql/updates/world/master/2016_12_24_04_world.sql b/sql/old/7/world/00_2017_04_18/2016_12_24_04_world.sql
index bf6dd47bd8d..bf6dd47bd8d 100644
--- a/sql/updates/world/master/2016_12_24_04_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2016_12_24_04_world.sql
diff --git a/sql/updates/world/master/2016_12_26_00_world.sql b/sql/old/7/world/00_2017_04_18/2016_12_26_00_world.sql
index 9c729251f28..9c729251f28 100644
--- a/sql/updates/world/master/2016_12_26_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2016_12_26_00_world.sql
diff --git a/sql/updates/world/master/2017_01_07_00_world_2016_04_25_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_07_00_world_2016_04_25_01_world.sql
index f83b99f1710..f83b99f1710 100644
--- a/sql/updates/world/master/2017_01_07_00_world_2016_04_25_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_07_00_world_2016_04_25_01_world.sql
diff --git a/sql/updates/world/master/2017_01_07_01_world_2016_04_25_02_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_07_01_world_2016_04_25_02_world.sql
index 31d98dd616c..31d98dd616c 100644
--- a/sql/updates/world/master/2017_01_07_01_world_2016_04_25_02_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_07_01_world_2016_04_25_02_world.sql
diff --git a/sql/updates/world/master/2017_01_07_02_world_2016_04_24_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_07_02_world_2016_04_24_01_world.sql
index 0d9f3aa6bd7..0d9f3aa6bd7 100644
--- a/sql/updates/world/master/2017_01_07_02_world_2016_04_24_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_07_02_world_2016_04_24_01_world.sql
diff --git a/sql/updates/world/master/2017_01_07_03_world_2016_04_25_03_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_07_03_world_2016_04_25_03_world.sql
index 58c1745c859..58c1745c859 100644
--- a/sql/updates/world/master/2017_01_07_03_world_2016_04_25_03_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_07_03_world_2016_04_25_03_world.sql
diff --git a/sql/updates/world/master/2017_01_07_04_world_2016_04_26_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_07_04_world_2016_04_26_00_world.sql
index 72201221944..72201221944 100644
--- a/sql/updates/world/master/2017_01_07_04_world_2016_04_26_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_07_04_world_2016_04_26_00_world.sql
diff --git a/sql/updates/world/master/2017_01_07_05_world_2016_04_26_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_07_05_world_2016_04_26_01_world.sql
index 2c3367d26d3..2c3367d26d3 100644
--- a/sql/updates/world/master/2017_01_07_05_world_2016_04_26_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_07_05_world_2016_04_26_01_world.sql
diff --git a/sql/updates/world/master/2017_01_07_06_world_2016_04_26_02_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_07_06_world_2016_04_26_02_world.sql
index 4df837e0d8f..4df837e0d8f 100644
--- a/sql/updates/world/master/2017_01_07_06_world_2016_04_26_02_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_07_06_world_2016_04_26_02_world.sql
diff --git a/sql/updates/world/master/2017_01_07_07_world_2016_04_26_03_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_07_07_world_2016_04_26_03_world.sql
index 1abf1600568..1abf1600568 100644
--- a/sql/updates/world/master/2017_01_07_07_world_2016_04_26_03_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_07_07_world_2016_04_26_03_world.sql
diff --git a/sql/updates/world/master/2017_01_07_08_world_2016_04_28_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_07_08_world_2016_04_28_00_world.sql
index 377f019f899..377f019f899 100644
--- a/sql/updates/world/master/2017_01_07_08_world_2016_04_28_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_07_08_world_2016_04_28_00_world.sql
diff --git a/sql/updates/world/master/2017_01_07_09_world_2016_04_29_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_07_09_world_2016_04_29_00_world.sql
index 14c700c0795..14c700c0795 100644
--- a/sql/updates/world/master/2017_01_07_09_world_2016_04_29_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_07_09_world_2016_04_29_00_world.sql
diff --git a/sql/updates/world/master/2017_01_07_10_world_2016_04_29_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_07_10_world_2016_04_29_01_world.sql
index c5b0311e1bc..c5b0311e1bc 100644
--- a/sql/updates/world/master/2017_01_07_10_world_2016_04_29_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_07_10_world_2016_04_29_01_world.sql
diff --git a/sql/updates/world/master/2017_01_07_11_world_2016_05_01_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_07_11_world_2016_05_01_01_world.sql
index 30096e55335..30096e55335 100644
--- a/sql/updates/world/master/2017_01_07_11_world_2016_05_01_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_07_11_world_2016_05_01_01_world.sql
diff --git a/sql/updates/world/master/2017_01_07_12_world_2016_05_02_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_07_12_world_2016_05_02_00_world.sql
index 2063baf1ad7..2063baf1ad7 100644
--- a/sql/updates/world/master/2017_01_07_12_world_2016_05_02_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_07_12_world_2016_05_02_00_world.sql
diff --git a/sql/updates/world/master/2017_01_07_13_world_2016_05_04_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_07_13_world_2016_05_04_00_world.sql
index e4043768774..e4043768774 100644
--- a/sql/updates/world/master/2017_01_07_13_world_2016_05_04_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_07_13_world_2016_05_04_00_world.sql
diff --git a/sql/updates/world/master/2017_01_07_14_world_2016_05_04_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_07_14_world_2016_05_04_01_world.sql
index 34427d0b238..34427d0b238 100644
--- a/sql/updates/world/master/2017_01_07_14_world_2016_05_04_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_07_14_world_2016_05_04_01_world.sql
diff --git a/sql/updates/world/master/2017_01_07_15_world_2016_05_04_02_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_07_15_world_2016_05_04_02_world.sql
index 4bb7870a4ea..4bb7870a4ea 100644
--- a/sql/updates/world/master/2017_01_07_15_world_2016_05_04_02_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_07_15_world_2016_05_04_02_world.sql
diff --git a/sql/updates/world/master/2017_01_07_16_world_2016_05_05_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_07_16_world_2016_05_05_00_world.sql
index ba99f5df1a6..ba99f5df1a6 100644
--- a/sql/updates/world/master/2017_01_07_16_world_2016_05_05_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_07_16_world_2016_05_05_00_world.sql
diff --git a/sql/updates/world/master/2017_01_07_17_world_2016_05_05_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_07_17_world_2016_05_05_01_world.sql
index 776daa985e9..776daa985e9 100644
--- a/sql/updates/world/master/2017_01_07_17_world_2016_05_05_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_07_17_world_2016_05_05_01_world.sql
diff --git a/sql/updates/world/master/2017_01_07_18_world_2016_05_07_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_07_18_world_2016_05_07_00_world.sql
index 41a35083921..41a35083921 100644
--- a/sql/updates/world/master/2017_01_07_18_world_2016_05_07_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_07_18_world_2016_05_07_00_world.sql
diff --git a/sql/updates/world/master/2017_01_07_19_world_2016_05_07_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_07_19_world_2016_05_07_01_world.sql
index 1479c1bfba2..1479c1bfba2 100644
--- a/sql/updates/world/master/2017_01_07_19_world_2016_05_07_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_07_19_world_2016_05_07_01_world.sql
diff --git a/sql/updates/world/master/2017_01_07_20_world_2016_05_09_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_07_20_world_2016_05_09_01_world.sql
index b75eb63dd2b..b75eb63dd2b 100644
--- a/sql/updates/world/master/2017_01_07_20_world_2016_05_09_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_07_20_world_2016_05_09_01_world.sql
diff --git a/sql/updates/world/master/2017_01_08_00_world_2016_05_09_02_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_08_00_world_2016_05_09_02_world.sql
index 968ac92561e..968ac92561e 100644
--- a/sql/updates/world/master/2017_01_08_00_world_2016_05_09_02_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_08_00_world_2016_05_09_02_world.sql
diff --git a/sql/updates/world/master/2017_01_08_01_world_2016_05_09_03_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_08_01_world_2016_05_09_03_world.sql
index 149d829c9f7..149d829c9f7 100644
--- a/sql/updates/world/master/2017_01_08_01_world_2016_05_09_03_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_08_01_world_2016_05_09_03_world.sql
diff --git a/sql/updates/world/master/2017_01_08_02_world_2016_05_09_04_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_08_02_world_2016_05_09_04_world.sql
index 111b000efeb..111b000efeb 100644
--- a/sql/updates/world/master/2017_01_08_02_world_2016_05_09_04_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_08_02_world_2016_05_09_04_world.sql
diff --git a/sql/updates/world/master/2017_01_08_03_world_2016_05_11_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_08_03_world_2016_05_11_01_world.sql
index 7741f6e8e4f..7741f6e8e4f 100644
--- a/sql/updates/world/master/2017_01_08_03_world_2016_05_11_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_08_03_world_2016_05_11_01_world.sql
diff --git a/sql/updates/world/master/2017_01_08_04_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_08_04_world.sql
index a9db414fc25..a9db414fc25 100644
--- a/sql/updates/world/master/2017_01_08_04_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_08_04_world.sql
diff --git a/sql/updates/world/master/2017_01_08_05_world_2016_05_20_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_08_05_world_2016_05_20_00_world.sql
index 321057aa8ef..321057aa8ef 100644
--- a/sql/updates/world/master/2017_01_08_05_world_2016_05_20_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_08_05_world_2016_05_20_00_world.sql
diff --git a/sql/updates/world/master/2017_01_09_00_world_2016_05_23_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_09_00_world_2016_05_23_00_world.sql
index b2b9b9b0b34..b2b9b9b0b34 100644
--- a/sql/updates/world/master/2017_01_09_00_world_2016_05_23_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_09_00_world_2016_05_23_00_world.sql
diff --git a/sql/updates/world/master/2017_01_09_01_world_2016_05_24_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_09_01_world_2016_05_24_00_world.sql
index 831c14755b6..831c14755b6 100644
--- a/sql/updates/world/master/2017_01_09_01_world_2016_05_24_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_09_01_world_2016_05_24_00_world.sql
diff --git a/sql/updates/world/master/2017_01_09_02_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_09_02_world.sql
index e807045d98d..e807045d98d 100644
--- a/sql/updates/world/master/2017_01_09_02_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_09_02_world.sql
diff --git a/sql/updates/world/master/2017_01_09_03_world_2016_05_26_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_09_03_world_2016_05_26_01_world.sql
index 343bc6f0a17..343bc6f0a17 100644
--- a/sql/updates/world/master/2017_01_09_03_world_2016_05_26_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_09_03_world_2016_05_26_01_world.sql
diff --git a/sql/updates/world/master/2017_01_09_04_world_2016_05_26_02_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_09_04_world_2016_05_26_02_world.sql
index 4cacdc73a47..4cacdc73a47 100644
--- a/sql/updates/world/master/2017_01_09_04_world_2016_05_26_02_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_09_04_world_2016_05_26_02_world.sql
diff --git a/sql/updates/world/master/2017_01_09_05_world_2016_05_26_03_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_09_05_world_2016_05_26_03_world.sql
index f3a419e9bd0..f3a419e9bd0 100644
--- a/sql/updates/world/master/2017_01_09_05_world_2016_05_26_03_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_09_05_world_2016_05_26_03_world.sql
diff --git a/sql/updates/world/master/2017_01_09_06_world_2016_05_26_04_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_09_06_world_2016_05_26_04_world.sql
index 00ae15af434..00ae15af434 100644
--- a/sql/updates/world/master/2017_01_09_06_world_2016_05_26_04_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_09_06_world_2016_05_26_04_world.sql
diff --git a/sql/updates/world/master/2017_01_09_07_world_2016_05_26_05_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_09_07_world_2016_05_26_05_world.sql
index 192ea0893d3..192ea0893d3 100644
--- a/sql/updates/world/master/2017_01_09_07_world_2016_05_26_05_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_09_07_world_2016_05_26_05_world.sql
diff --git a/sql/updates/world/master/2017_01_09_08_world_2016_05_26_07_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_09_08_world_2016_05_26_07_world.sql
index 0749f080581..0749f080581 100644
--- a/sql/updates/world/master/2017_01_09_08_world_2016_05_26_07_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_09_08_world_2016_05_26_07_world.sql
diff --git a/sql/updates/world/master/2017_01_09_09_world_2016_05_26_09_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_09_09_world_2016_05_26_09_world.sql
index 0ad751a01d4..0ad751a01d4 100644
--- a/sql/updates/world/master/2017_01_09_09_world_2016_05_26_09_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_09_09_world_2016_05_26_09_world.sql
diff --git a/sql/updates/world/master/2017_01_09_10_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_09_10_world.sql
index 0b8f8e412d5..0b8f8e412d5 100644
--- a/sql/updates/world/master/2017_01_09_10_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_09_10_world.sql
diff --git a/sql/updates/world/master/2017_01_09_11_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_09_11_world.sql
index a23b1a7de75..a23b1a7de75 100644
--- a/sql/updates/world/master/2017_01_09_11_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_09_11_world.sql
diff --git a/sql/updates/world/master/2017_01_09_12_world_2016_05_28_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_09_12_world_2016_05_28_00_world.sql
index 602f7834cd8..602f7834cd8 100644
--- a/sql/updates/world/master/2017_01_09_12_world_2016_05_28_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_09_12_world_2016_05_28_00_world.sql
diff --git a/sql/updates/world/master/2017_01_09_13_world_2016_05_28_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_09_13_world_2016_05_28_01_world.sql
index 0ce802fd363..0ce802fd363 100644
--- a/sql/updates/world/master/2017_01_09_13_world_2016_05_28_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_09_13_world_2016_05_28_01_world.sql
diff --git a/sql/updates/world/master/2017_01_09_14_world_2016_05_28_03_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_09_14_world_2016_05_28_03_world.sql
index 69ee8803260..69ee8803260 100644
--- a/sql/updates/world/master/2017_01_09_14_world_2016_05_28_03_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_09_14_world_2016_05_28_03_world.sql
diff --git a/sql/updates/world/master/2017_01_09_15_world_2016_05_30_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_09_15_world_2016_05_30_00_world.sql
index c231e725672..c231e725672 100644
--- a/sql/updates/world/master/2017_01_09_15_world_2016_05_30_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_09_15_world_2016_05_30_00_world.sql
diff --git a/sql/updates/world/master/2017_01_09_16_world_2016_05_30_03_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_09_16_world_2016_05_30_03_world.sql
index eeaa7bf6d7b..eeaa7bf6d7b 100644
--- a/sql/updates/world/master/2017_01_09_16_world_2016_05_30_03_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_09_16_world_2016_05_30_03_world.sql
diff --git a/sql/updates/world/master/2017_01_10_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_10_00_world.sql
index c961e4ecc73..c961e4ecc73 100644
--- a/sql/updates/world/master/2017_01_10_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_10_00_world.sql
diff --git a/sql/updates/world/master/2017_01_10_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_10_01_world.sql
index 06474d5bdf4..06474d5bdf4 100644
--- a/sql/updates/world/master/2017_01_10_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_10_01_world.sql
diff --git a/sql/updates/world/master/2017_01_11_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_11_00_world.sql
index e84bea32276..e84bea32276 100644
--- a/sql/updates/world/master/2017_01_11_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_11_00_world.sql
diff --git a/sql/updates/world/master/2017_01_11_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_11_01_world.sql
index 9e27d32b230..9e27d32b230 100644
--- a/sql/updates/world/master/2017_01_11_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_11_01_world.sql
diff --git a/sql/updates/world/master/2017_01_11_02_world_2016_05_30_08_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_11_02_world_2016_05_30_08_world.sql
index 134617b0380..134617b0380 100644
--- a/sql/updates/world/master/2017_01_11_02_world_2016_05_30_08_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_11_02_world_2016_05_30_08_world.sql
diff --git a/sql/updates/world/master/2017_01_11_03_world_2016_05_30_09_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_11_03_world_2016_05_30_09_world.sql
index 38f95ee6c0b..38f95ee6c0b 100644
--- a/sql/updates/world/master/2017_01_11_03_world_2016_05_30_09_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_11_03_world_2016_05_30_09_world.sql
diff --git a/sql/updates/world/master/2017_01_11_04_world_2016_05_30_10_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_11_04_world_2016_05_30_10_world.sql
index 9c362b16d7d..9c362b16d7d 100644
--- a/sql/updates/world/master/2017_01_11_04_world_2016_05_30_10_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_11_04_world_2016_05_30_10_world.sql
diff --git a/sql/updates/world/master/2017_01_11_05_world_2016_05_31_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_11_05_world_2016_05_31_00_world.sql
index 29a29413167..29a29413167 100644
--- a/sql/updates/world/master/2017_01_11_05_world_2016_05_31_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_11_05_world_2016_05_31_00_world.sql
diff --git a/sql/updates/world/master/2017_01_11_06_world_2016_05_31_02_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_11_06_world_2016_05_31_02_world.sql
index 09674385ab4..09674385ab4 100644
--- a/sql/updates/world/master/2017_01_11_06_world_2016_05_31_02_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_11_06_world_2016_05_31_02_world.sql
diff --git a/sql/updates/world/master/2017_01_11_07_world_2016_05_31_03_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_11_07_world_2016_05_31_03_world.sql
index 60c07d15735..60c07d15735 100644
--- a/sql/updates/world/master/2017_01_11_07_world_2016_05_31_03_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_11_07_world_2016_05_31_03_world.sql
diff --git a/sql/updates/world/master/2017_01_11_08_world_2016_05_31_04_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_11_08_world_2016_05_31_04_world.sql
index d3ddfcfa05c..d3ddfcfa05c 100644
--- a/sql/updates/world/master/2017_01_11_08_world_2016_05_31_04_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_11_08_world_2016_05_31_04_world.sql
diff --git a/sql/updates/world/master/2017_01_11_09_world_2016_05_31_05_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_11_09_world_2016_05_31_05_world.sql
index 18bbf61baa4..18bbf61baa4 100644
--- a/sql/updates/world/master/2017_01_11_09_world_2016_05_31_05_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_11_09_world_2016_05_31_05_world.sql
diff --git a/sql/updates/world/master/2017_01_11_10_world_2016_05_31_06_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_11_10_world_2016_05_31_06_world.sql
index 46d8b875c82..46d8b875c82 100644
--- a/sql/updates/world/master/2017_01_11_10_world_2016_05_31_06_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_11_10_world_2016_05_31_06_world.sql
diff --git a/sql/updates/world/master/2017_01_11_11_world_2016_05_31_07_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_11_11_world_2016_05_31_07_world.sql
index 7ed017ff1cd..7ed017ff1cd 100644
--- a/sql/updates/world/master/2017_01_11_11_world_2016_05_31_07_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_11_11_world_2016_05_31_07_world.sql
diff --git a/sql/updates/world/master/2017_01_11_12_world_2016_05_31_08_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_11_12_world_2016_05_31_08_world.sql
index 2cf3fbcdfc4..2cf3fbcdfc4 100644
--- a/sql/updates/world/master/2017_01_11_12_world_2016_05_31_08_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_11_12_world_2016_05_31_08_world.sql
diff --git a/sql/updates/world/master/2017_01_11_13_world_2016_05_31_09_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_11_13_world_2016_05_31_09_world.sql
index 73d62a92772..73d62a92772 100644
--- a/sql/updates/world/master/2017_01_11_13_world_2016_05_31_09_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_11_13_world_2016_05_31_09_world.sql
diff --git a/sql/updates/world/master/2017_01_11_14_world_2016_05_31_10_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_11_14_world_2016_05_31_10_world.sql
index e7536b3a51a..e7536b3a51a 100644
--- a/sql/updates/world/master/2017_01_11_14_world_2016_05_31_10_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_11_14_world_2016_05_31_10_world.sql
diff --git a/sql/updates/world/master/2017_01_11_15_world_2016_05_31_11_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_11_15_world_2016_05_31_11_world.sql
index e5d35f5eb42..e5d35f5eb42 100644
--- a/sql/updates/world/master/2017_01_11_15_world_2016_05_31_11_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_11_15_world_2016_05_31_11_world.sql
diff --git a/sql/updates/world/master/2017_01_11_16_world_2016_05_31_13_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_11_16_world_2016_05_31_13_world.sql
index 6dd3d984c1c..6dd3d984c1c 100644
--- a/sql/updates/world/master/2017_01_11_16_world_2016_05_31_13_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_11_16_world_2016_05_31_13_world.sql
diff --git a/sql/updates/world/master/2017_01_11_17_world_2016_06_01_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_11_17_world_2016_06_01_01_world.sql
index 80ecabe34aa..80ecabe34aa 100644
--- a/sql/updates/world/master/2017_01_11_17_world_2016_06_01_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_11_17_world_2016_06_01_01_world.sql
diff --git a/sql/updates/world/master/2017_01_11_18_world_2016_06_01_03_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_11_18_world_2016_06_01_03_world.sql
index 54beb26b15c..54beb26b15c 100644
--- a/sql/updates/world/master/2017_01_11_18_world_2016_06_01_03_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_11_18_world_2016_06_01_03_world.sql
diff --git a/sql/updates/world/master/2017_01_11_19_world_2016_06_01_05_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_11_19_world_2016_06_01_05_world.sql
index 3d7a32ac308..3d7a32ac308 100644
--- a/sql/updates/world/master/2017_01_11_19_world_2016_06_01_05_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_11_19_world_2016_06_01_05_world.sql
diff --git a/sql/updates/world/master/2017_01_11_20_world_2016_06_01_08_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_11_20_world_2016_06_01_08_world.sql
index 356c0561bf2..356c0561bf2 100644
--- a/sql/updates/world/master/2017_01_11_20_world_2016_06_01_08_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_11_20_world_2016_06_01_08_world.sql
diff --git a/sql/updates/world/master/2017_01_11_21_world_2016_06_01_09_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_11_21_world_2016_06_01_09_world.sql
index 5cf06521a19..5cf06521a19 100644
--- a/sql/updates/world/master/2017_01_11_21_world_2016_06_01_09_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_11_21_world_2016_06_01_09_world.sql
diff --git a/sql/updates/world/master/2017_01_11_22_world_2016_06_01_11_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_11_22_world_2016_06_01_11_world.sql
index dc0b7b05a33..dc0b7b05a33 100644
--- a/sql/updates/world/master/2017_01_11_22_world_2016_06_01_11_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_11_22_world_2016_06_01_11_world.sql
diff --git a/sql/updates/world/master/2017_01_11_23_world_2016_06_01_12_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_11_23_world_2016_06_01_12_world.sql
index f6fb906bb70..f6fb906bb70 100644
--- a/sql/updates/world/master/2017_01_11_23_world_2016_06_01_12_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_11_23_world_2016_06_01_12_world.sql
diff --git a/sql/updates/world/master/2017_01_11_24_world_2016_06_02_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_11_24_world_2016_06_02_00_world.sql
index c1167d60305..c1167d60305 100644
--- a/sql/updates/world/master/2017_01_11_24_world_2016_06_02_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_11_24_world_2016_06_02_00_world.sql
diff --git a/sql/updates/world/master/2017_01_11_25_world_2016_06_02_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_11_25_world_2016_06_02_01_world.sql
index 792f221e344..792f221e344 100644
--- a/sql/updates/world/master/2017_01_11_25_world_2016_06_02_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_11_25_world_2016_06_02_01_world.sql
diff --git a/sql/updates/world/master/2017_01_11_26_world_2016_06_04_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_11_26_world_2016_06_04_00_world.sql
index e44fe54de55..e44fe54de55 100644
--- a/sql/updates/world/master/2017_01_11_26_world_2016_06_04_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_11_26_world_2016_06_04_00_world.sql
diff --git a/sql/updates/world/master/2017_01_12_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_12_00_world.sql
index 3655a322a20..3655a322a20 100644
--- a/sql/updates/world/master/2017_01_12_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_12_00_world.sql
diff --git a/sql/updates/world/master/2017_01_12_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_12_01_world.sql
index 104564f21a5..104564f21a5 100644
--- a/sql/updates/world/master/2017_01_12_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_12_01_world.sql
diff --git a/sql/updates/world/master/2017_01_12_02_world_2016_06_05_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_12_02_world_2016_06_05_00_world.sql
index 6da2282d424..6da2282d424 100644
--- a/sql/updates/world/master/2017_01_12_02_world_2016_06_05_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_12_02_world_2016_06_05_00_world.sql
diff --git a/sql/updates/world/master/2017_01_12_03_world_2016_06_05_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_12_03_world_2016_06_05_01_world.sql
index 444a5be17ed..444a5be17ed 100644
--- a/sql/updates/world/master/2017_01_12_03_world_2016_06_05_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_12_03_world_2016_06_05_01_world.sql
diff --git a/sql/updates/world/master/2017_01_12_04_world_2016_06_05_02_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_12_04_world_2016_06_05_02_world.sql
index cab093eb88f..cab093eb88f 100644
--- a/sql/updates/world/master/2017_01_12_04_world_2016_06_05_02_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_12_04_world_2016_06_05_02_world.sql
diff --git a/sql/updates/world/master/2017_01_12_05_world_2016_06_05_04_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_12_05_world_2016_06_05_04_world.sql
index fdf6b535f8d..fdf6b535f8d 100644
--- a/sql/updates/world/master/2017_01_12_05_world_2016_06_05_04_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_12_05_world_2016_06_05_04_world.sql
diff --git a/sql/updates/world/master/2017_01_12_06_world_2016_06_05_08_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_12_06_world_2016_06_05_08_world.sql
index a2f5c580f92..a2f5c580f92 100644
--- a/sql/updates/world/master/2017_01_12_06_world_2016_06_05_08_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_12_06_world_2016_06_05_08_world.sql
diff --git a/sql/updates/world/master/2017_01_12_07_world_2016_06_05_09_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_12_07_world_2016_06_05_09_world.sql
index 98f707aafcd..98f707aafcd 100644
--- a/sql/updates/world/master/2017_01_12_07_world_2016_06_05_09_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_12_07_world_2016_06_05_09_world.sql
diff --git a/sql/updates/world/master/2017_01_12_08_world_2016_06_05_10_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_12_08_world_2016_06_05_10_world.sql
index 66c6e8dbc7c..66c6e8dbc7c 100644
--- a/sql/updates/world/master/2017_01_12_08_world_2016_06_05_10_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_12_08_world_2016_06_05_10_world.sql
diff --git a/sql/updates/world/master/2017_01_12_09_world_2016_06_05_11_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_12_09_world_2016_06_05_11_world.sql
index 3a76d73f9ab..3a76d73f9ab 100644
--- a/sql/updates/world/master/2017_01_12_09_world_2016_06_05_11_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_12_09_world_2016_06_05_11_world.sql
diff --git a/sql/updates/world/master/2017_01_12_10_world_2016_06_05_12_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_12_10_world_2016_06_05_12_world.sql
index a446260985f..a446260985f 100644
--- a/sql/updates/world/master/2017_01_12_10_world_2016_06_05_12_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_12_10_world_2016_06_05_12_world.sql
diff --git a/sql/updates/world/master/2017_01_12_11_world_2016_06_06_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_12_11_world_2016_06_06_00_world.sql
index 61d93dab677..61d93dab677 100644
--- a/sql/updates/world/master/2017_01_12_11_world_2016_06_06_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_12_11_world_2016_06_06_00_world.sql
diff --git a/sql/updates/world/master/2017_01_12_12_world_2016_06_07_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_12_12_world_2016_06_07_00_world.sql
index fbe7c362718..fbe7c362718 100644
--- a/sql/updates/world/master/2017_01_12_12_world_2016_06_07_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_12_12_world_2016_06_07_00_world.sql
diff --git a/sql/updates/world/master/2017_01_12_13_world_2016_06_07_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_12_13_world_2016_06_07_01_world.sql
index 09e86bc0396..09e86bc0396 100644
--- a/sql/updates/world/master/2017_01_12_13_world_2016_06_07_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_12_13_world_2016_06_07_01_world.sql
diff --git a/sql/updates/world/master/2017_01_12_14_world_2016_05_15_15_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_12_14_world_2016_05_15_15_world.sql
index f3a8ec3d6e8..f3a8ec3d6e8 100644
--- a/sql/updates/world/master/2017_01_12_14_world_2016_05_15_15_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_12_14_world_2016_05_15_15_world.sql
diff --git a/sql/updates/world/master/2017_01_12_15_world_2016_06_09_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_12_15_world_2016_06_09_01_world.sql
index b29242b6038..b29242b6038 100644
--- a/sql/updates/world/master/2017_01_12_15_world_2016_06_09_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_12_15_world_2016_06_09_01_world.sql
diff --git a/sql/updates/world/master/2017_01_12_16_world_2016_06_09_02_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_12_16_world_2016_06_09_02_world.sql
index b2a7d985a9f..b2a7d985a9f 100644
--- a/sql/updates/world/master/2017_01_12_16_world_2016_06_09_02_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_12_16_world_2016_06_09_02_world.sql
diff --git a/sql/updates/world/master/2017_01_12_17_world_2016_06_09_03_world_335.sql b/sql/old/7/world/00_2017_04_18/2017_01_12_17_world_2016_06_09_03_world_335.sql
index c4be18500b9..c4be18500b9 100644
--- a/sql/updates/world/master/2017_01_12_17_world_2016_06_09_03_world_335.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_12_17_world_2016_06_09_03_world_335.sql
diff --git a/sql/updates/world/master/2017_01_12_18_world_2016_06_09_04_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_12_18_world_2016_06_09_04_world.sql
index ecff9eb7ce6..ecff9eb7ce6 100644
--- a/sql/updates/world/master/2017_01_12_18_world_2016_06_09_04_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_12_18_world_2016_06_09_04_world.sql
diff --git a/sql/updates/world/master/2017_01_12_19_world_2016_06_09_05_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_12_19_world_2016_06_09_05_world.sql
index 50c99117c03..50c99117c03 100644
--- a/sql/updates/world/master/2017_01_12_19_world_2016_06_09_05_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_12_19_world_2016_06_09_05_world.sql
diff --git a/sql/updates/world/master/2017_01_12_20_world_2016_06_11_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_12_20_world_2016_06_11_00_world.sql
index ea81a3ce563..ea81a3ce563 100644
--- a/sql/updates/world/master/2017_01_12_20_world_2016_06_11_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_12_20_world_2016_06_11_00_world.sql
diff --git a/sql/updates/world/master/2017_01_12_21_world_2016_06_11_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_12_21_world_2016_06_11_01_world.sql
index c7185f6642c..c7185f6642c 100644
--- a/sql/updates/world/master/2017_01_12_21_world_2016_06_11_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_12_21_world_2016_06_11_01_world.sql
diff --git a/sql/updates/world/master/2017_01_12_22_world_2016_06_11_03_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_12_22_world_2016_06_11_03_world.sql
index 47e3aefa366..47e3aefa366 100644
--- a/sql/updates/world/master/2017_01_12_22_world_2016_06_11_03_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_12_22_world_2016_06_11_03_world.sql
diff --git a/sql/updates/world/master/2017_01_12_23_world_2016_06_11_11_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_12_23_world_2016_06_11_11_world.sql
index 86e6fa082b2..86e6fa082b2 100644
--- a/sql/updates/world/master/2017_01_12_23_world_2016_06_11_11_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_12_23_world_2016_06_11_11_world.sql
diff --git a/sql/updates/world/master/2017_01_12_24_world_2016_06_11_12_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_12_24_world_2016_06_11_12_world.sql
index be2587e862a..be2587e862a 100644
--- a/sql/updates/world/master/2017_01_12_24_world_2016_06_11_12_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_12_24_world_2016_06_11_12_world.sql
diff --git a/sql/updates/world/master/2017_01_12_25_world_2016_06_12_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_12_25_world_2016_06_12_01_world.sql
index 62e2c2cc600..62e2c2cc600 100644
--- a/sql/updates/world/master/2017_01_12_25_world_2016_06_12_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_12_25_world_2016_06_12_01_world.sql
diff --git a/sql/updates/world/master/2017_01_12_26_world_2016_06_12_02_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_12_26_world_2016_06_12_02_world.sql
index dc1709d6d2f..dc1709d6d2f 100644
--- a/sql/updates/world/master/2017_01_12_26_world_2016_06_12_02_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_12_26_world_2016_06_12_02_world.sql
diff --git a/sql/updates/world/master/2017_01_12_27_world_2016_06_12_03_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_12_27_world_2016_06_12_03_world.sql
index c1864e88bc3..c1864e88bc3 100644
--- a/sql/updates/world/master/2017_01_12_27_world_2016_06_12_03_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_12_27_world_2016_06_12_03_world.sql
diff --git a/sql/updates/world/master/2017_01_12_28_world_2016_06_12_04_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_12_28_world_2016_06_12_04_world.sql
index 718394bc63b..718394bc63b 100644
--- a/sql/updates/world/master/2017_01_12_28_world_2016_06_12_04_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_12_28_world_2016_06_12_04_world.sql
diff --git a/sql/updates/world/master/2017_01_12_29_world_2016_06_12_09_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_12_29_world_2016_06_12_09_world.sql
index 19772c101ab..19772c101ab 100644
--- a/sql/updates/world/master/2017_01_12_29_world_2016_06_12_09_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_12_29_world_2016_06_12_09_world.sql
diff --git a/sql/updates/world/master/2017_01_12_30_world_2016_06_12_08_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_12_30_world_2016_06_12_08_world.sql
index c39e59c7ec8..c39e59c7ec8 100644
--- a/sql/updates/world/master/2017_01_12_30_world_2016_06_12_08_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_12_30_world_2016_06_12_08_world.sql
diff --git a/sql/updates/world/master/2017_01_12_31_world_2016_06_13_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_12_31_world_2016_06_13_01_world.sql
index 85d48c5a742..85d48c5a742 100644
--- a/sql/updates/world/master/2017_01_12_31_world_2016_06_13_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_12_31_world_2016_06_13_01_world.sql
diff --git a/sql/updates/world/master/2017_01_12_32_world_2016_06_13_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_12_32_world_2016_06_13_00_world.sql
index 287fb53747e..287fb53747e 100644
--- a/sql/updates/world/master/2017_01_12_32_world_2016_06_13_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_12_32_world_2016_06_13_00_world.sql
diff --git a/sql/updates/world/master/2017_01_12_33_world_2016_06_13_04_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_12_33_world_2016_06_13_04_world.sql
index d2ad9c21b39..d2ad9c21b39 100644
--- a/sql/updates/world/master/2017_01_12_33_world_2016_06_13_04_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_12_33_world_2016_06_13_04_world.sql
diff --git a/sql/updates/world/master/2017_01_12_34_world_2016_06_13_05_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_12_34_world_2016_06_13_05_world.sql
index b19f167a81a..b19f167a81a 100644
--- a/sql/updates/world/master/2017_01_12_34_world_2016_06_13_05_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_12_34_world_2016_06_13_05_world.sql
diff --git a/sql/updates/world/master/2017_01_12_35_world_2016_06_13_06_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_12_35_world_2016_06_13_06_world.sql
index 4ca697f1266..4ca697f1266 100644
--- a/sql/updates/world/master/2017_01_12_35_world_2016_06_13_06_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_12_35_world_2016_06_13_06_world.sql
diff --git a/sql/updates/world/master/2017_01_13_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_13_00_world.sql
index 772f40f164b..772f40f164b 100644
--- a/sql/updates/world/master/2017_01_13_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_13_00_world.sql
diff --git a/sql/updates/world/master/2017_01_15_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_15_00_world.sql
index 1d9cdc602c5..1d9cdc602c5 100644
--- a/sql/updates/world/master/2017_01_15_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_15_00_world.sql
diff --git a/sql/updates/world/master/2017_01_15_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_15_01_world.sql
index 0ce20c4652a..0ce20c4652a 100644
--- a/sql/updates/world/master/2017_01_15_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_15_01_world.sql
diff --git a/sql/updates/world/master/2017_01_15_02_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_15_02_world.sql
index f60d7b3f93c..f60d7b3f93c 100644
--- a/sql/updates/world/master/2017_01_15_02_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_15_02_world.sql
diff --git a/sql/updates/world/master/2017_01_15_03_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_15_03_world.sql
index 078bd1c495a..078bd1c495a 100644
--- a/sql/updates/world/master/2017_01_15_03_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_15_03_world.sql
diff --git a/sql/updates/world/master/2017_01_19_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_19_00_world.sql
index ee6049676b0..ee6049676b0 100644
--- a/sql/updates/world/master/2017_01_19_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_19_00_world.sql
diff --git a/sql/updates/world/master/2017_01_23_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_23_00_world.sql
index 68881dc5ece..68881dc5ece 100644
--- a/sql/updates/world/master/2017_01_23_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_23_00_world.sql
diff --git a/sql/updates/world/master/2017_01_24_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_24_00_world.sql
index 35d8371fca6..35d8371fca6 100644
--- a/sql/updates/world/master/2017_01_24_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_24_00_world.sql
diff --git a/sql/updates/world/master/2017_01_25_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_25_00_world.sql
index f2e8b8c906a..f2e8b8c906a 100644
--- a/sql/updates/world/master/2017_01_25_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_25_00_world.sql
diff --git a/sql/updates/world/master/2017_01_25_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_25_01_world.sql
index 7a44f08b9f8..7a44f08b9f8 100644
--- a/sql/updates/world/master/2017_01_25_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_25_01_world.sql
diff --git a/sql/updates/world/master/2017_01_25_02_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_25_02_world.sql
index a9897c2abc6..a9897c2abc6 100644
--- a/sql/updates/world/master/2017_01_25_02_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_25_02_world.sql
diff --git a/sql/updates/world/master/2017_01_25_03_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_25_03_world.sql
index 63b3f8d1006..63b3f8d1006 100644
--- a/sql/updates/world/master/2017_01_25_03_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_25_03_world.sql
diff --git a/sql/updates/world/master/2017_01_26_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_26_00_world.sql
index a9a5b3be019..a9a5b3be019 100644
--- a/sql/updates/world/master/2017_01_26_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_26_00_world.sql
diff --git a/sql/updates/world/master/2017_01_26_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_26_01_world.sql
index f1666b68762..f1666b68762 100644
--- a/sql/updates/world/master/2017_01_26_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_26_01_world.sql
diff --git a/sql/updates/world/master/2017_01_27_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_27_00_world.sql
index 48d132cec78..48d132cec78 100644
--- a/sql/updates/world/master/2017_01_27_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_27_00_world.sql
diff --git a/sql/updates/world/master/2017_01_27_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_27_01_world.sql
index 8fedc5efd63..8fedc5efd63 100644
--- a/sql/updates/world/master/2017_01_27_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_27_01_world.sql
diff --git a/sql/updates/world/master/2017_01_28_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_28_00_world.sql
index e496818b23e..e496818b23e 100644
--- a/sql/updates/world/master/2017_01_28_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_28_00_world.sql
diff --git a/sql/updates/world/master/2017_01_29_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_29_00_world.sql
index 6d99c38435f..6d99c38435f 100644
--- a/sql/updates/world/master/2017_01_29_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_29_00_world.sql
diff --git a/sql/updates/world/master/2017_01_29_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_29_01_world.sql
index 7a7246b0ae3..7a7246b0ae3 100644
--- a/sql/updates/world/master/2017_01_29_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_29_01_world.sql
diff --git a/sql/updates/world/master/2017_01_29_02_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_29_02_world.sql
index d50e0a41d82..d50e0a41d82 100644
--- a/sql/updates/world/master/2017_01_29_02_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_29_02_world.sql
diff --git a/sql/updates/world/master/2017_01_29_03_world_2016_06_14_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_29_03_world_2016_06_14_00_world.sql
index a59b0a911b7..a59b0a911b7 100644
--- a/sql/updates/world/master/2017_01_29_03_world_2016_06_14_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_29_03_world_2016_06_14_00_world.sql
diff --git a/sql/updates/world/master/2017_01_29_04_world_2016_06_14_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_29_04_world_2016_06_14_01_world.sql
index 63bc2f9d00b..63bc2f9d00b 100644
--- a/sql/updates/world/master/2017_01_29_04_world_2016_06_14_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_29_04_world_2016_06_14_01_world.sql
diff --git a/sql/updates/world/master/2017_01_29_05_world_2016_06_14_05_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_29_05_world_2016_06_14_05_world.sql
index 2b34562e4bb..2b34562e4bb 100644
--- a/sql/updates/world/master/2017_01_29_05_world_2016_06_14_05_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_29_05_world_2016_06_14_05_world.sql
diff --git a/sql/updates/world/master/2017_01_29_06_world_2016_06_15_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_29_06_world_2016_06_15_00_world.sql
index 42a373afa33..42a373afa33 100644
--- a/sql/updates/world/master/2017_01_29_06_world_2016_06_15_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_29_06_world_2016_06_15_00_world.sql
diff --git a/sql/updates/world/master/2017_01_29_07_world_2016_06_15_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_29_07_world_2016_06_15_01_world.sql
index 67865fccb26..67865fccb26 100644
--- a/sql/updates/world/master/2017_01_29_07_world_2016_06_15_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_29_07_world_2016_06_15_01_world.sql
diff --git a/sql/updates/world/master/2017_01_29_08_world_2016_06_15_02_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_29_08_world_2016_06_15_02_world.sql
index b94af5ec293..b94af5ec293 100644
--- a/sql/updates/world/master/2017_01_29_08_world_2016_06_15_02_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_29_08_world_2016_06_15_02_world.sql
diff --git a/sql/updates/world/master/2017_01_29_09_world_2016_06_15_03_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_29_09_world_2016_06_15_03_world.sql
index edc42a33642..edc42a33642 100644
--- a/sql/updates/world/master/2017_01_29_09_world_2016_06_15_03_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_29_09_world_2016_06_15_03_world.sql
diff --git a/sql/updates/world/master/2017_01_29_10_world_2016_06_15_04_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_29_10_world_2016_06_15_04_world.sql
index f976ba3093b..f976ba3093b 100644
--- a/sql/updates/world/master/2017_01_29_10_world_2016_06_15_04_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_29_10_world_2016_06_15_04_world.sql
diff --git a/sql/updates/world/master/2017_01_29_11_world_2016_06_15_05_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_29_11_world_2016_06_15_05_world.sql
index 1524c2f2a5e..1524c2f2a5e 100644
--- a/sql/updates/world/master/2017_01_29_11_world_2016_06_15_05_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_29_11_world_2016_06_15_05_world.sql
diff --git a/sql/updates/world/master/2017_01_29_12_world_2016_06_15_06_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_29_12_world_2016_06_15_06_world.sql
index 37cb1916599..37cb1916599 100644
--- a/sql/updates/world/master/2017_01_29_12_world_2016_06_15_06_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_29_12_world_2016_06_15_06_world.sql
diff --git a/sql/updates/world/master/2017_01_29_13_world_2016_06_15_10_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_29_13_world_2016_06_15_10_world.sql
index 6033ee9446c..6033ee9446c 100644
--- a/sql/updates/world/master/2017_01_29_13_world_2016_06_15_10_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_29_13_world_2016_06_15_10_world.sql
diff --git a/sql/updates/world/master/2017_01_29_14_world_2016_06_15_11_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_29_14_world_2016_06_15_11_world.sql
index 5409a886b28..5409a886b28 100644
--- a/sql/updates/world/master/2017_01_29_14_world_2016_06_15_11_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_29_14_world_2016_06_15_11_world.sql
diff --git a/sql/updates/world/master/2017_01_29_15_world_2016_06_15_12_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_29_15_world_2016_06_15_12_world.sql
index fdee4e98dbe..fdee4e98dbe 100644
--- a/sql/updates/world/master/2017_01_29_15_world_2016_06_15_12_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_29_15_world_2016_06_15_12_world.sql
diff --git a/sql/updates/world/master/2017_01_29_16_world_2016_06_15_14_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_29_16_world_2016_06_15_14_world.sql
index 410ae76253d..410ae76253d 100644
--- a/sql/updates/world/master/2017_01_29_16_world_2016_06_15_14_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_29_16_world_2016_06_15_14_world.sql
diff --git a/sql/updates/world/master/2017_01_29_17_world_2016_06_16_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_29_17_world_2016_06_16_00_world.sql
index f6958ad4dc7..f6958ad4dc7 100644
--- a/sql/updates/world/master/2017_01_29_17_world_2016_06_16_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_29_17_world_2016_06_16_00_world.sql
diff --git a/sql/updates/world/master/2017_01_29_18_world_2016_06_17_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_29_18_world_2016_06_17_00_world.sql
index 33094fd818a..33094fd818a 100644
--- a/sql/updates/world/master/2017_01_29_18_world_2016_06_17_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_29_18_world_2016_06_17_00_world.sql
diff --git a/sql/updates/world/master/2017_01_29_19_world_2016_06_18_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_29_19_world_2016_06_18_00_world.sql
index 8135c5e64b0..8135c5e64b0 100644
--- a/sql/updates/world/master/2017_01_29_19_world_2016_06_18_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_29_19_world_2016_06_18_00_world.sql
diff --git a/sql/updates/world/master/2017_01_29_20_world_2016_06_18_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_29_20_world_2016_06_18_01_world.sql
index 1a9d8fbce85..1a9d8fbce85 100644
--- a/sql/updates/world/master/2017_01_29_20_world_2016_06_18_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_29_20_world_2016_06_18_01_world.sql
diff --git a/sql/updates/world/master/2017_01_29_21_world_2016_06_18_02_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_29_21_world_2016_06_18_02_world.sql
index 7b49e7c25f3..7b49e7c25f3 100644
--- a/sql/updates/world/master/2017_01_29_21_world_2016_06_18_02_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_29_21_world_2016_06_18_02_world.sql
diff --git a/sql/updates/world/master/2017_01_29_22_world_2016_06_20_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_29_22_world_2016_06_20_00_world.sql
index d14f0042fa7..d14f0042fa7 100644
--- a/sql/updates/world/master/2017_01_29_22_world_2016_06_20_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_29_22_world_2016_06_20_00_world.sql
diff --git a/sql/updates/world/master/2017_01_29_23_world_2016_06_20_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_29_23_world_2016_06_20_01_world.sql
index eb8ebef9293..eb8ebef9293 100644
--- a/sql/updates/world/master/2017_01_29_23_world_2016_06_20_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_29_23_world_2016_06_20_01_world.sql
diff --git a/sql/updates/world/master/2017_01_29_24_world_2016_06_20_02_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_29_24_world_2016_06_20_02_world.sql
index 9bb24fa9b60..9bb24fa9b60 100644
--- a/sql/updates/world/master/2017_01_29_24_world_2016_06_20_02_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_29_24_world_2016_06_20_02_world.sql
diff --git a/sql/updates/world/master/2017_01_29_25_world_2016_06_20_03_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_29_25_world_2016_06_20_03_world.sql
index 3d94c0ace5f..3d94c0ace5f 100644
--- a/sql/updates/world/master/2017_01_29_25_world_2016_06_20_03_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_29_25_world_2016_06_20_03_world.sql
diff --git a/sql/updates/world/master/2017_01_30_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_01_30_00_world.sql
index ac00cf0d98c..ac00cf0d98c 100644
--- a/sql/updates/world/master/2017_01_30_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_01_30_00_world.sql
diff --git a/sql/updates/world/master/2017_02_01_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_01_00_world.sql
index 3be3c49ec6f..3be3c49ec6f 100644
--- a/sql/updates/world/master/2017_02_01_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_01_00_world.sql
diff --git a/sql/updates/world/master/2017_02_01_01_world_2016_06_22_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_01_01_world_2016_06_22_00_world.sql
index fd2d4d8743b..fd2d4d8743b 100644
--- a/sql/updates/world/master/2017_02_01_01_world_2016_06_22_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_01_01_world_2016_06_22_00_world.sql
diff --git a/sql/updates/world/master/2017_02_01_02_world_2016_06_22_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_01_02_world_2016_06_22_01_world.sql
index bf11bee736b..bf11bee736b 100644
--- a/sql/updates/world/master/2017_02_01_02_world_2016_06_22_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_01_02_world_2016_06_22_01_world.sql
diff --git a/sql/updates/world/master/2017_02_01_03_world_2016_06_22_02_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_01_03_world_2016_06_22_02_world.sql
index f73b0f6a6f6..f73b0f6a6f6 100644
--- a/sql/updates/world/master/2017_02_01_03_world_2016_06_22_02_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_01_03_world_2016_06_22_02_world.sql
diff --git a/sql/updates/world/master/2017_02_01_04_world_2016_06_22_03_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_01_04_world_2016_06_22_03_world.sql
index fd9ec3247f2..fd9ec3247f2 100644
--- a/sql/updates/world/master/2017_02_01_04_world_2016_06_22_03_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_01_04_world_2016_06_22_03_world.sql
diff --git a/sql/updates/world/master/2017_02_01_05_world_2016_06_23_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_01_05_world_2016_06_23_00_world.sql
index aa94f9895d0..aa94f9895d0 100644
--- a/sql/updates/world/master/2017_02_01_05_world_2016_06_23_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_01_05_world_2016_06_23_00_world.sql
diff --git a/sql/updates/world/master/2017_02_02_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_02_01_world.sql
index c55d8a34ae4..c55d8a34ae4 100644
--- a/sql/updates/world/master/2017_02_02_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_02_01_world.sql
diff --git a/sql/updates/world/master/2017_02_03_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_03_00_world.sql
index a2759d4eab3..a2759d4eab3 100644
--- a/sql/updates/world/master/2017_02_03_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_03_00_world.sql
diff --git a/sql/updates/world/master/2017_02_04_00_world_2016_06_25_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_04_00_world_2016_06_25_00_world.sql
index f1337038533..f1337038533 100644
--- a/sql/updates/world/master/2017_02_04_00_world_2016_06_25_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_04_00_world_2016_06_25_00_world.sql
diff --git a/sql/updates/world/master/2017_02_04_01_world_2016_06_25_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_04_01_world_2016_06_25_01_world.sql
index a318c821fb9..a318c821fb9 100644
--- a/sql/updates/world/master/2017_02_04_01_world_2016_06_25_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_04_01_world_2016_06_25_01_world.sql
diff --git a/sql/updates/world/master/2017_02_04_02_world_2016_06_25_02_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_04_02_world_2016_06_25_02_world.sql
index cf4e814d813..cf4e814d813 100644
--- a/sql/updates/world/master/2017_02_04_02_world_2016_06_25_02_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_04_02_world_2016_06_25_02_world.sql
diff --git a/sql/updates/world/master/2017_02_04_03_world_2016_06_25_03_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_04_03_world_2016_06_25_03_world.sql
index d193f38a922..d193f38a922 100644
--- a/sql/updates/world/master/2017_02_04_03_world_2016_06_25_03_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_04_03_world_2016_06_25_03_world.sql
diff --git a/sql/updates/world/master/2017_02_04_04_world_2016_06_26_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_04_04_world_2016_06_26_00_world.sql
index 1551f6a646e..1551f6a646e 100644
--- a/sql/updates/world/master/2017_02_04_04_world_2016_06_26_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_04_04_world_2016_06_26_00_world.sql
diff --git a/sql/updates/world/master/2017_02_04_05_world_2016_06_26_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_04_05_world_2016_06_26_01_world.sql
index b9ab8f12a54..b9ab8f12a54 100644
--- a/sql/updates/world/master/2017_02_04_05_world_2016_06_26_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_04_05_world_2016_06_26_01_world.sql
diff --git a/sql/updates/world/master/2017_02_04_06_world_2016_06_26_02_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_04_06_world_2016_06_26_02_world.sql
index 0e5064b33c1..0e5064b33c1 100644
--- a/sql/updates/world/master/2017_02_04_06_world_2016_06_26_02_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_04_06_world_2016_06_26_02_world.sql
diff --git a/sql/updates/world/master/2017_02_04_07_world_2016_06_27_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_04_07_world_2016_06_27_00_world.sql
index d84c8158542..d84c8158542 100644
--- a/sql/updates/world/master/2017_02_04_07_world_2016_06_27_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_04_07_world_2016_06_27_00_world.sql
diff --git a/sql/updates/world/master/2017_02_04_08_world_2016_06_27_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_04_08_world_2016_06_27_01_world.sql
index 6f7d3a34127..6f7d3a34127 100644
--- a/sql/updates/world/master/2017_02_04_08_world_2016_06_27_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_04_08_world_2016_06_27_01_world.sql
diff --git a/sql/updates/world/master/2017_02_04_09_world_2016_06_27_02_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_04_09_world_2016_06_27_02_world.sql
index 6484f75afc4..6484f75afc4 100644
--- a/sql/updates/world/master/2017_02_04_09_world_2016_06_27_02_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_04_09_world_2016_06_27_02_world.sql
diff --git a/sql/updates/world/master/2017_02_04_10_world_2016_06_29_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_04_10_world_2016_06_29_00_world.sql
index b4dcaf7c15e..b4dcaf7c15e 100644
--- a/sql/updates/world/master/2017_02_04_10_world_2016_06_29_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_04_10_world_2016_06_29_00_world.sql
diff --git a/sql/updates/world/master/2017_02_04_11_world_2016_06_29_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_04_11_world_2016_06_29_01_world.sql
index 73539708a09..73539708a09 100644
--- a/sql/updates/world/master/2017_02_04_11_world_2016_06_29_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_04_11_world_2016_06_29_01_world.sql
diff --git a/sql/updates/world/master/2017_02_04_12_world_2016_07_04_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_04_12_world_2016_07_04_00_world.sql
index 963381006fb..963381006fb 100644
--- a/sql/updates/world/master/2017_02_04_12_world_2016_07_04_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_04_12_world_2016_07_04_00_world.sql
diff --git a/sql/updates/world/master/2017_02_04_13_world_2016_07_04_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_04_13_world_2016_07_04_01_world.sql
index 28f18ef6987..28f18ef6987 100644
--- a/sql/updates/world/master/2017_02_04_13_world_2016_07_04_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_04_13_world_2016_07_04_01_world.sql
diff --git a/sql/updates/world/master/2017_02_04_14_world_2016_07_04_02_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_04_14_world_2016_07_04_02_world.sql
index 5282ae12337..5282ae12337 100644
--- a/sql/updates/world/master/2017_02_04_14_world_2016_07_04_02_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_04_14_world_2016_07_04_02_world.sql
diff --git a/sql/updates/world/master/2017_02_04_15_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_04_15_world.sql
index 0de135cf7f3..0de135cf7f3 100644
--- a/sql/updates/world/master/2017_02_04_15_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_04_15_world.sql
diff --git a/sql/updates/world/master/2017_02_04_16_world_2016_07_04_03_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_04_16_world_2016_07_04_03_world.sql
index 106953e74d7..106953e74d7 100644
--- a/sql/updates/world/master/2017_02_04_16_world_2016_07_04_03_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_04_16_world_2016_07_04_03_world.sql
diff --git a/sql/updates/world/master/2017_02_04_17_world_2016_07_04_05_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_04_17_world_2016_07_04_05_world.sql
index d19e8862b45..d19e8862b45 100644
--- a/sql/updates/world/master/2017_02_04_17_world_2016_07_04_05_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_04_17_world_2016_07_04_05_world.sql
diff --git a/sql/updates/world/master/2017_02_04_18_world_2016_07_04_06_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_04_18_world_2016_07_04_06_world.sql
index 6cc2a01d03c..6cc2a01d03c 100644
--- a/sql/updates/world/master/2017_02_04_18_world_2016_07_04_06_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_04_18_world_2016_07_04_06_world.sql
diff --git a/sql/updates/world/master/2017_02_04_19_world_2016_07_04_07_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_04_19_world_2016_07_04_07_world.sql
index ae262760873..ae262760873 100644
--- a/sql/updates/world/master/2017_02_04_19_world_2016_07_04_07_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_04_19_world_2016_07_04_07_world.sql
diff --git a/sql/updates/world/master/2017_02_04_20_world_2016_07_04_08_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_04_20_world_2016_07_04_08_world.sql
index 3af82274a98..3af82274a98 100644
--- a/sql/updates/world/master/2017_02_04_20_world_2016_07_04_08_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_04_20_world_2016_07_04_08_world.sql
diff --git a/sql/updates/world/master/2017_02_04_21_world_2016_07_04_09_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_04_21_world_2016_07_04_09_world.sql
index 29cb4809078..29cb4809078 100644
--- a/sql/updates/world/master/2017_02_04_21_world_2016_07_04_09_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_04_21_world_2016_07_04_09_world.sql
diff --git a/sql/updates/world/master/2017_02_04_22_world_2016_07_04_10_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_04_22_world_2016_07_04_10_world.sql
index 564f03ac93b..564f03ac93b 100644
--- a/sql/updates/world/master/2017_02_04_22_world_2016_07_04_10_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_04_22_world_2016_07_04_10_world.sql
diff --git a/sql/updates/world/master/2017_02_04_23_world_2016_07_04_11_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_04_23_world_2016_07_04_11_world.sql
index e8989d28544..e8989d28544 100644
--- a/sql/updates/world/master/2017_02_04_23_world_2016_07_04_11_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_04_23_world_2016_07_04_11_world.sql
diff --git a/sql/updates/world/master/2017_02_04_24_world_2016_07_04_12_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_04_24_world_2016_07_04_12_world.sql
index ea56bab8e79..ea56bab8e79 100644
--- a/sql/updates/world/master/2017_02_04_24_world_2016_07_04_12_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_04_24_world_2016_07_04_12_world.sql
diff --git a/sql/updates/world/master/2017_02_04_25_world_2016_07_05_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_04_25_world_2016_07_05_00_world.sql
index f21f7a04959..f21f7a04959 100644
--- a/sql/updates/world/master/2017_02_04_25_world_2016_07_05_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_04_25_world_2016_07_05_00_world.sql
diff --git a/sql/updates/world/master/2017_02_04_26_world_2016_07_05_03_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_04_26_world_2016_07_05_03_world.sql
index 6a91e39c26c..6a91e39c26c 100644
--- a/sql/updates/world/master/2017_02_04_26_world_2016_07_05_03_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_04_26_world_2016_07_05_03_world.sql
diff --git a/sql/updates/world/master/2017_02_04_27_world_2016_07_06_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_04_27_world_2016_07_06_00_world.sql
index 3875299dde0..3875299dde0 100644
--- a/sql/updates/world/master/2017_02_04_27_world_2016_07_06_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_04_27_world_2016_07_06_00_world.sql
diff --git a/sql/updates/world/master/2017_02_04_28_world_2016_07_06_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_04_28_world_2016_07_06_01_world.sql
index 8275d04461c..8275d04461c 100644
--- a/sql/updates/world/master/2017_02_04_28_world_2016_07_06_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_04_28_world_2016_07_06_01_world.sql
diff --git a/sql/updates/world/master/2017_02_04_29_world_2016_07_06_02_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_04_29_world_2016_07_06_02_world.sql
index 954a82b5a8e..954a82b5a8e 100644
--- a/sql/updates/world/master/2017_02_04_29_world_2016_07_06_02_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_04_29_world_2016_07_06_02_world.sql
diff --git a/sql/updates/world/master/2017_02_04_30_world_2016_07_06_03_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_04_30_world_2016_07_06_03_world.sql
index db205700124..db205700124 100644
--- a/sql/updates/world/master/2017_02_04_30_world_2016_07_06_03_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_04_30_world_2016_07_06_03_world.sql
diff --git a/sql/updates/world/master/2017_02_04_31_world_2016_07_07_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_04_31_world_2016_07_07_00_world.sql
index edfb3fe7c28..edfb3fe7c28 100644
--- a/sql/updates/world/master/2017_02_04_31_world_2016_07_07_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_04_31_world_2016_07_07_00_world.sql
diff --git a/sql/updates/world/master/2017_02_04_32_world_2016_07_07_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_04_32_world_2016_07_07_01_world.sql
index e88a8173b9f..e88a8173b9f 100644
--- a/sql/updates/world/master/2017_02_04_32_world_2016_07_07_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_04_32_world_2016_07_07_01_world.sql
diff --git a/sql/updates/world/master/2017_02_04_33_world_2016_07_07_04_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_04_33_world_2016_07_07_04_world.sql
index 0747a024a0a..0747a024a0a 100644
--- a/sql/updates/world/master/2017_02_04_33_world_2016_07_07_04_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_04_33_world_2016_07_07_04_world.sql
diff --git a/sql/updates/world/master/2017_02_04_34_world_2016_07_07_05_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_04_34_world_2016_07_07_05_world.sql
index fa6a9ede9f7..fa6a9ede9f7 100644
--- a/sql/updates/world/master/2017_02_04_34_world_2016_07_07_05_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_04_34_world_2016_07_07_05_world.sql
diff --git a/sql/updates/world/master/2017_02_04_35_world_2016_07_09_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_04_35_world_2016_07_09_00_world.sql
index 87b6865e8a6..87b6865e8a6 100644
--- a/sql/updates/world/master/2017_02_04_35_world_2016_07_09_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_04_35_world_2016_07_09_00_world.sql
diff --git a/sql/updates/world/master/2017_02_05_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_05_00_world.sql
index 1c6bb8b8a2e..1c6bb8b8a2e 100644
--- a/sql/updates/world/master/2017_02_05_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_05_00_world.sql
diff --git a/sql/updates/world/master/2017_02_05_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_05_01_world.sql
index 5d58ff77a37..5d58ff77a37 100644
--- a/sql/updates/world/master/2017_02_05_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_05_01_world.sql
diff --git a/sql/updates/world/master/2017_02_05_02_world_2016_07_10_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_05_02_world_2016_07_10_00_world.sql
index 06f6e89de2d..06f6e89de2d 100644
--- a/sql/updates/world/master/2017_02_05_02_world_2016_07_10_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_05_02_world_2016_07_10_00_world.sql
diff --git a/sql/updates/world/master/2017_02_05_03_world_2016_07_10_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_05_03_world_2016_07_10_01_world.sql
index 11a04a8af30..11a04a8af30 100644
--- a/sql/updates/world/master/2017_02_05_03_world_2016_07_10_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_05_03_world_2016_07_10_01_world.sql
diff --git a/sql/updates/world/master/2017_02_05_04_world_2016_07_10_02_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_05_04_world_2016_07_10_02_world.sql
index 57ff1fd9cca..57ff1fd9cca 100644
--- a/sql/updates/world/master/2017_02_05_04_world_2016_07_10_02_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_05_04_world_2016_07_10_02_world.sql
diff --git a/sql/updates/world/master/2017_02_05_05_world_2016_07_10_03_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_05_05_world_2016_07_10_03_world.sql
index a63b75d0e0f..a63b75d0e0f 100644
--- a/sql/updates/world/master/2017_02_05_05_world_2016_07_10_03_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_05_05_world_2016_07_10_03_world.sql
diff --git a/sql/updates/world/master/2017_02_05_06_world_2016_07_10_04_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_05_06_world_2016_07_10_04_world.sql
index 343b4585da9..343b4585da9 100644
--- a/sql/updates/world/master/2017_02_05_06_world_2016_07_10_04_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_05_06_world_2016_07_10_04_world.sql
diff --git a/sql/updates/world/master/2017_02_05_07_world_2016_07_10_05_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_05_07_world_2016_07_10_05_world.sql
index 46d0cd341fe..46d0cd341fe 100644
--- a/sql/updates/world/master/2017_02_05_07_world_2016_07_10_05_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_05_07_world_2016_07_10_05_world.sql
diff --git a/sql/updates/world/master/2017_02_05_08_world_2016_07_10_06_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_05_08_world_2016_07_10_06_world.sql
index 7594560ce2a..7594560ce2a 100644
--- a/sql/updates/world/master/2017_02_05_08_world_2016_07_10_06_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_05_08_world_2016_07_10_06_world.sql
diff --git a/sql/updates/world/master/2017_02_05_09_world_2016_07_10_07_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_05_09_world_2016_07_10_07_world.sql
index 03fb6fd6db4..03fb6fd6db4 100644
--- a/sql/updates/world/master/2017_02_05_09_world_2016_07_10_07_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_05_09_world_2016_07_10_07_world.sql
diff --git a/sql/updates/world/master/2017_02_05_10_world_2016_07_12_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_05_10_world_2016_07_12_00_world.sql
index 47d3b96882d..47d3b96882d 100644
--- a/sql/updates/world/master/2017_02_05_10_world_2016_07_12_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_05_10_world_2016_07_12_00_world.sql
diff --git a/sql/updates/world/master/2017_02_05_11_world_2016_07_12_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_05_11_world_2016_07_12_01_world.sql
index ee772f5a448..ee772f5a448 100644
--- a/sql/updates/world/master/2017_02_05_11_world_2016_07_12_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_05_11_world_2016_07_12_01_world.sql
diff --git a/sql/updates/world/master/2017_02_05_12_world_2016_07_12_02_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_05_12_world_2016_07_12_02_world.sql
index 4bc7f50fc80..4bc7f50fc80 100644
--- a/sql/updates/world/master/2017_02_05_12_world_2016_07_12_02_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_05_12_world_2016_07_12_02_world.sql
diff --git a/sql/updates/world/master/2017_02_05_13_world_2016_07_13_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_05_13_world_2016_07_13_00_world.sql
index 4fb83eb1eb7..4fb83eb1eb7 100644
--- a/sql/updates/world/master/2017_02_05_13_world_2016_07_13_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_05_13_world_2016_07_13_00_world.sql
diff --git a/sql/updates/world/master/2017_02_05_14_world_2016_07_13_01_world_335.sql b/sql/old/7/world/00_2017_04_18/2017_02_05_14_world_2016_07_13_01_world_335.sql
index 48898573868..48898573868 100644
--- a/sql/updates/world/master/2017_02_05_14_world_2016_07_13_01_world_335.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_05_14_world_2016_07_13_01_world_335.sql
diff --git a/sql/updates/world/master/2017_02_05_15_world_2016_07_14_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_05_15_world_2016_07_14_00_world.sql
index 5f45b70c942..5f45b70c942 100644
--- a/sql/updates/world/master/2017_02_05_15_world_2016_07_14_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_05_15_world_2016_07_14_00_world.sql
diff --git a/sql/updates/world/master/2017_02_05_16_world_2016_07_15_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_05_16_world_2016_07_15_00_world.sql
index 6168cb638f3..6168cb638f3 100644
--- a/sql/updates/world/master/2017_02_05_16_world_2016_07_15_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_05_16_world_2016_07_15_00_world.sql
diff --git a/sql/updates/world/master/2017_02_05_17_world_2016_07_15_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_05_17_world_2016_07_15_01_world.sql
index 2a6466dd1cc..2a6466dd1cc 100644
--- a/sql/updates/world/master/2017_02_05_17_world_2016_07_15_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_05_17_world_2016_07_15_01_world.sql
diff --git a/sql/updates/world/master/2017_02_05_18_world_2016_07_15_04_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_05_18_world_2016_07_15_04_world.sql
index e45302cde89..e45302cde89 100644
--- a/sql/updates/world/master/2017_02_05_18_world_2016_07_15_04_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_05_18_world_2016_07_15_04_world.sql
diff --git a/sql/updates/world/master/2017_02_05_19_world_2016_07_15_05_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_05_19_world_2016_07_15_05_world.sql
index a024b62590e..a024b62590e 100644
--- a/sql/updates/world/master/2017_02_05_19_world_2016_07_15_05_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_05_19_world_2016_07_15_05_world.sql
diff --git a/sql/updates/world/master/2017_02_05_20_world_2016_07_15_06_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_05_20_world_2016_07_15_06_world.sql
index 5ea95d750c1..5ea95d750c1 100644
--- a/sql/updates/world/master/2017_02_05_20_world_2016_07_15_06_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_05_20_world_2016_07_15_06_world.sql
diff --git a/sql/updates/world/master/2017_02_05_21_world_2016_07_15_07_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_05_21_world_2016_07_15_07_world.sql
index b44d7669386..b44d7669386 100644
--- a/sql/updates/world/master/2017_02_05_21_world_2016_07_15_07_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_05_21_world_2016_07_15_07_world.sql
diff --git a/sql/updates/world/master/2017_02_05_22_world_2016_07_15_08_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_05_22_world_2016_07_15_08_world.sql
index e4ea72c2173..e4ea72c2173 100644
--- a/sql/updates/world/master/2017_02_05_22_world_2016_07_15_08_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_05_22_world_2016_07_15_08_world.sql
diff --git a/sql/updates/world/master/2017_02_05_23_world_2016_07_10_09_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_05_23_world_2016_07_10_09_world.sql
index 67e6ce625e9..67e6ce625e9 100644
--- a/sql/updates/world/master/2017_02_05_23_world_2016_07_10_09_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_05_23_world_2016_07_10_09_world.sql
diff --git a/sql/updates/world/master/2017_02_05_24_world_2016_07_15_10_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_05_24_world_2016_07_15_10_world.sql
index 3b9491a1748..3b9491a1748 100644
--- a/sql/updates/world/master/2017_02_05_24_world_2016_07_15_10_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_05_24_world_2016_07_15_10_world.sql
diff --git a/sql/updates/world/master/2017_02_05_25_world_2016_07_15_11_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_05_25_world_2016_07_15_11_world.sql
index f0d5555af27..f0d5555af27 100644
--- a/sql/updates/world/master/2017_02_05_25_world_2016_07_15_11_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_05_25_world_2016_07_15_11_world.sql
diff --git a/sql/updates/world/master/2017_02_05_26_world_2016_07_16_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_05_26_world_2016_07_16_00_world.sql
index 0dd86f346e9..0dd86f346e9 100644
--- a/sql/updates/world/master/2017_02_05_26_world_2016_07_16_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_05_26_world_2016_07_16_00_world.sql
diff --git a/sql/updates/world/master/2017_02_05_27_world_2016_07_16_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_05_27_world_2016_07_16_01_world.sql
index 25b0dd9a071..25b0dd9a071 100644
--- a/sql/updates/world/master/2017_02_05_27_world_2016_07_16_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_05_27_world_2016_07_16_01_world.sql
diff --git a/sql/updates/world/master/2017_02_05_28_world_2016_07_16_03_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_05_28_world_2016_07_16_03_world.sql
index 986a96a6d57..986a96a6d57 100644
--- a/sql/updates/world/master/2017_02_05_28_world_2016_07_16_03_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_05_28_world_2016_07_16_03_world.sql
diff --git a/sql/updates/world/master/2017_02_05_29_world_2016_07_16_04_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_05_29_world_2016_07_16_04_world.sql
index 9bdba2e4deb..9bdba2e4deb 100644
--- a/sql/updates/world/master/2017_02_05_29_world_2016_07_16_04_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_05_29_world_2016_07_16_04_world.sql
diff --git a/sql/updates/world/master/2017_02_05_30_world_2016_07_16_08_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_05_30_world_2016_07_16_08_world.sql
index af4db3f1567..af4db3f1567 100644
--- a/sql/updates/world/master/2017_02_05_30_world_2016_07_16_08_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_05_30_world_2016_07_16_08_world.sql
diff --git a/sql/updates/world/master/2017_02_05_31_world_2016_07_18_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_05_31_world_2016_07_18_00_world.sql
index 7682fe310e3..7682fe310e3 100644
--- a/sql/updates/world/master/2017_02_05_31_world_2016_07_18_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_05_31_world_2016_07_18_00_world.sql
diff --git a/sql/updates/world/master/2017_02_05_32_world_2016_07_18_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_05_32_world_2016_07_18_01_world.sql
index 47425de1744..47425de1744 100644
--- a/sql/updates/world/master/2017_02_05_32_world_2016_07_18_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_05_32_world_2016_07_18_01_world.sql
diff --git a/sql/updates/world/master/2017_02_07_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_07_00_world.sql
index 7fd7d137f60..7fd7d137f60 100644
--- a/sql/updates/world/master/2017_02_07_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_07_00_world.sql
diff --git a/sql/updates/world/master/2017_02_07_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_07_01_world.sql
index 42fcfda8f1f..42fcfda8f1f 100644
--- a/sql/updates/world/master/2017_02_07_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_07_01_world.sql
diff --git a/sql/updates/world/master/2017_02_09_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_09_00_world.sql
index ff841af46a3..ff841af46a3 100644
--- a/sql/updates/world/master/2017_02_09_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_09_00_world.sql
diff --git a/sql/updates/world/master/2017_02_10_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_10_00_world.sql
index 662855662df..662855662df 100644
--- a/sql/updates/world/master/2017_02_10_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_10_00_world.sql
diff --git a/sql/updates/world/master/2017_02_10_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_10_01_world.sql
index 88d84baab14..88d84baab14 100644
--- a/sql/updates/world/master/2017_02_10_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_10_01_world.sql
diff --git a/sql/updates/world/master/2017_02_11_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_11_00_world.sql
index 2b28e31773c..2b28e31773c 100644
--- a/sql/updates/world/master/2017_02_11_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_11_00_world.sql
diff --git a/sql/updates/world/master/2017_02_11_01_world_2016_07_19_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_11_01_world_2016_07_19_00_world.sql
index ae623f25db0..ae623f25db0 100644
--- a/sql/updates/world/master/2017_02_11_01_world_2016_07_19_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_11_01_world_2016_07_19_00_world.sql
diff --git a/sql/updates/world/master/2017_02_11_02_world_2016_07_19_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_11_02_world_2016_07_19_01_world.sql
index 02d522f183c..02d522f183c 100644
--- a/sql/updates/world/master/2017_02_11_02_world_2016_07_19_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_11_02_world_2016_07_19_01_world.sql
diff --git a/sql/updates/world/master/2017_02_11_03_world_2016_07_19_02_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_11_03_world_2016_07_19_02_world.sql
index 782178a66f8..782178a66f8 100644
--- a/sql/updates/world/master/2017_02_11_03_world_2016_07_19_02_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_11_03_world_2016_07_19_02_world.sql
diff --git a/sql/updates/world/master/2017_02_11_04_world_2016_07_19_03_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_11_04_world_2016_07_19_03_world.sql
index 147095d7ea0..147095d7ea0 100644
--- a/sql/updates/world/master/2017_02_11_04_world_2016_07_19_03_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_11_04_world_2016_07_19_03_world.sql
diff --git a/sql/updates/world/master/2017_02_11_05_world_2016_07_19_04_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_11_05_world_2016_07_19_04_world.sql
index 449999b41e1..449999b41e1 100644
--- a/sql/updates/world/master/2017_02_11_05_world_2016_07_19_04_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_11_05_world_2016_07_19_04_world.sql
diff --git a/sql/updates/world/master/2017_02_11_06_world_2016_07_19_06_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_11_06_world_2016_07_19_06_world.sql
index 44fad2ffd2a..44fad2ffd2a 100644
--- a/sql/updates/world/master/2017_02_11_06_world_2016_07_19_06_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_11_06_world_2016_07_19_06_world.sql
diff --git a/sql/updates/world/master/2017_02_11_07_world_2016_07_19_07_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_11_07_world_2016_07_19_07_world.sql
index 6fafc733431..6fafc733431 100644
--- a/sql/updates/world/master/2017_02_11_07_world_2016_07_19_07_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_11_07_world_2016_07_19_07_world.sql
diff --git a/sql/updates/world/master/2017_02_11_08_world_2016_07_20_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_11_08_world_2016_07_20_01_world.sql
index 47274168c85..47274168c85 100644
--- a/sql/updates/world/master/2017_02_11_08_world_2016_07_20_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_11_08_world_2016_07_20_01_world.sql
diff --git a/sql/updates/world/master/2017_02_11_09_world_2016_07_20_02_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_11_09_world_2016_07_20_02_world.sql
index 125fa3bd8c8..125fa3bd8c8 100644
--- a/sql/updates/world/master/2017_02_11_09_world_2016_07_20_02_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_11_09_world_2016_07_20_02_world.sql
diff --git a/sql/updates/world/master/2017_02_11_10_world_2016_07_22_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_11_10_world_2016_07_22_00_world.sql
index 9f2158cb723..9f2158cb723 100644
--- a/sql/updates/world/master/2017_02_11_10_world_2016_07_22_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_11_10_world_2016_07_22_00_world.sql
diff --git a/sql/updates/world/master/2017_02_11_11_world_2016_07_25_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_11_11_world_2016_07_25_00_world.sql
index fbc63a9f174..fbc63a9f174 100644
--- a/sql/updates/world/master/2017_02_11_11_world_2016_07_25_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_11_11_world_2016_07_25_00_world.sql
diff --git a/sql/updates/world/master/2017_02_11_12_world_2016_07_28_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_11_12_world_2016_07_28_00_world.sql
index 89d9d616efb..89d9d616efb 100644
--- a/sql/updates/world/master/2017_02_11_12_world_2016_07_28_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_11_12_world_2016_07_28_00_world.sql
diff --git a/sql/updates/world/master/2017_02_11_13_world_2016_07_29_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_11_13_world_2016_07_29_00_world.sql
index 89b32cd993a..89b32cd993a 100644
--- a/sql/updates/world/master/2017_02_11_13_world_2016_07_29_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_11_13_world_2016_07_29_00_world.sql
diff --git a/sql/updates/world/master/2017_02_11_14_world_2016_07_30_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_11_14_world_2016_07_30_00_world.sql
index 934f641f788..934f641f788 100644
--- a/sql/updates/world/master/2017_02_11_14_world_2016_07_30_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_11_14_world_2016_07_30_00_world.sql
diff --git a/sql/updates/world/master/2017_02_11_15_world_2016_07_30_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_11_15_world_2016_07_30_01_world.sql
index 2c67ceb729d..2c67ceb729d 100644
--- a/sql/updates/world/master/2017_02_11_15_world_2016_07_30_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_11_15_world_2016_07_30_01_world.sql
diff --git a/sql/updates/world/master/2017_02_11_16_world_2016_08_01_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_11_16_world_2016_08_01_01_world.sql
index 327e58bf5c9..327e58bf5c9 100644
--- a/sql/updates/world/master/2017_02_11_16_world_2016_08_01_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_11_16_world_2016_08_01_01_world.sql
diff --git a/sql/updates/world/master/2017_02_11_17_world_2016_08_02_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_11_17_world_2016_08_02_00_world.sql
index a5fe8c29c3e..a5fe8c29c3e 100644
--- a/sql/updates/world/master/2017_02_11_17_world_2016_08_02_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_11_17_world_2016_08_02_00_world.sql
diff --git a/sql/updates/world/master/2017_02_11_18_world_2016_08_03_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_11_18_world_2016_08_03_00_world.sql
index ee9a582d083..ee9a582d083 100644
--- a/sql/updates/world/master/2017_02_11_18_world_2016_08_03_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_11_18_world_2016_08_03_00_world.sql
diff --git a/sql/updates/world/master/2017_02_11_19_world_2016_08_03_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_11_19_world_2016_08_03_01_world.sql
index e535f2e786f..e535f2e786f 100644
--- a/sql/updates/world/master/2017_02_11_19_world_2016_08_03_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_11_19_world_2016_08_03_01_world.sql
diff --git a/sql/updates/world/master/2017_02_11_20_world_2016_08_03_02_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_11_20_world_2016_08_03_02_world.sql
index dca6c1a34b3..dca6c1a34b3 100644
--- a/sql/updates/world/master/2017_02_11_20_world_2016_08_03_02_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_11_20_world_2016_08_03_02_world.sql
diff --git a/sql/updates/world/master/2017_02_11_21_world_2016_08_04_00_world_335.sql b/sql/old/7/world/00_2017_04_18/2017_02_11_21_world_2016_08_04_00_world_335.sql
index 09f5768c7a1..09f5768c7a1 100644
--- a/sql/updates/world/master/2017_02_11_21_world_2016_08_04_00_world_335.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_11_21_world_2016_08_04_00_world_335.sql
diff --git a/sql/updates/world/master/2017_02_11_22_world_2016_08_04_02_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_11_22_world_2016_08_04_02_world.sql
index 7a94e5526aa..7a94e5526aa 100644
--- a/sql/updates/world/master/2017_02_11_22_world_2016_08_04_02_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_11_22_world_2016_08_04_02_world.sql
diff --git a/sql/updates/world/master/2017_02_11_23_world_2016_08_05_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_11_23_world_2016_08_05_00_world.sql
index ec10cbfcf36..ec10cbfcf36 100644
--- a/sql/updates/world/master/2017_02_11_23_world_2016_08_05_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_11_23_world_2016_08_05_00_world.sql
diff --git a/sql/updates/world/master/2017_02_11_24_world_2016_08_06_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_11_24_world_2016_08_06_00_world.sql
index 250ba104ae5..250ba104ae5 100644
--- a/sql/updates/world/master/2017_02_11_24_world_2016_08_06_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_11_24_world_2016_08_06_00_world.sql
diff --git a/sql/updates/world/master/2017_02_11_25_world_2016_08_04_03_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_11_25_world_2016_08_04_03_world.sql
index f7bce378a47..f7bce378a47 100644
--- a/sql/updates/world/master/2017_02_11_25_world_2016_08_04_03_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_11_25_world_2016_08_04_03_world.sql
diff --git a/sql/updates/world/master/2017_02_11_26_world_2016_08_08_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_11_26_world_2016_08_08_00_world.sql
index 60e8bf27d17..60e8bf27d17 100644
--- a/sql/updates/world/master/2017_02_11_26_world_2016_08_08_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_11_26_world_2016_08_08_00_world.sql
diff --git a/sql/updates/world/master/2017_02_11_27_world_2016_08_08_02_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_11_27_world_2016_08_08_02_world.sql
index e22279a640d..e22279a640d 100644
--- a/sql/updates/world/master/2017_02_11_27_world_2016_08_08_02_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_11_27_world_2016_08_08_02_world.sql
diff --git a/sql/updates/world/master/2017_02_12_00_world_2016_08_11_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_12_00_world_2016_08_11_00_world.sql
index 02f0f13005e..02f0f13005e 100644
--- a/sql/updates/world/master/2017_02_12_00_world_2016_08_11_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_12_00_world_2016_08_11_00_world.sql
diff --git a/sql/updates/world/master/2017_02_12_01_world_2016_08_14_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_12_01_world_2016_08_14_00_world.sql
index 046d50dddad..046d50dddad 100644
--- a/sql/updates/world/master/2017_02_12_01_world_2016_08_14_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_12_01_world_2016_08_14_00_world.sql
diff --git a/sql/updates/world/master/2017_02_12_02_world_2016_08_14_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_12_02_world_2016_08_14_01_world.sql
index b40520fc672..b40520fc672 100644
--- a/sql/updates/world/master/2017_02_12_02_world_2016_08_14_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_12_02_world_2016_08_14_01_world.sql
diff --git a/sql/updates/world/master/2017_02_12_03_world_2016_08_14_02_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_12_03_world_2016_08_14_02_world.sql
index e05f32dac7a..e05f32dac7a 100644
--- a/sql/updates/world/master/2017_02_12_03_world_2016_08_14_02_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_12_03_world_2016_08_14_02_world.sql
diff --git a/sql/updates/world/master/2017_02_12_04_world_2016_08_15_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_12_04_world_2016_08_15_00_world.sql
index 867d5b127a5..867d5b127a5 100644
--- a/sql/updates/world/master/2017_02_12_04_world_2016_08_15_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_12_04_world_2016_08_15_00_world.sql
diff --git a/sql/updates/world/master/2017_02_12_05_world_2016_08_15_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_12_05_world_2016_08_15_01_world.sql
index 9091c0fcdae..9091c0fcdae 100644
--- a/sql/updates/world/master/2017_02_12_05_world_2016_08_15_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_12_05_world_2016_08_15_01_world.sql
diff --git a/sql/updates/world/master/2017_02_12_06_world_2016_08_17_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_12_06_world_2016_08_17_01_world.sql
index 631a827084f..631a827084f 100644
--- a/sql/updates/world/master/2017_02_12_06_world_2016_08_17_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_12_06_world_2016_08_17_01_world.sql
diff --git a/sql/updates/world/master/2017_02_12_07_world_2016_08_18_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_12_07_world_2016_08_18_00_world.sql
index 5b35dd68148..5b35dd68148 100644
--- a/sql/updates/world/master/2017_02_12_07_world_2016_08_18_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_12_07_world_2016_08_18_00_world.sql
diff --git a/sql/updates/world/master/2017_02_12_08_world_2016_08_19_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_12_08_world_2016_08_19_00_world.sql
index 208482f7d89..208482f7d89 100644
--- a/sql/updates/world/master/2017_02_12_08_world_2016_08_19_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_12_08_world_2016_08_19_00_world.sql
diff --git a/sql/updates/world/master/2017_02_12_09_world_2016_08_19_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_12_09_world_2016_08_19_01_world.sql
index 2cdb65bdeb3..2cdb65bdeb3 100644
--- a/sql/updates/world/master/2017_02_12_09_world_2016_08_19_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_12_09_world_2016_08_19_01_world.sql
diff --git a/sql/updates/world/master/2017_02_12_10_world_2016_08_19_02_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_12_10_world_2016_08_19_02_world.sql
index 261f3317835..261f3317835 100644
--- a/sql/updates/world/master/2017_02_12_10_world_2016_08_19_02_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_12_10_world_2016_08_19_02_world.sql
diff --git a/sql/updates/world/master/2017_02_12_11_world_2016_08_19_03_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_12_11_world_2016_08_19_03_world.sql
index b10a117e6e9..b10a117e6e9 100644
--- a/sql/updates/world/master/2017_02_12_11_world_2016_08_19_03_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_12_11_world_2016_08_19_03_world.sql
diff --git a/sql/updates/world/master/2017_02_12_12_world_2016_08_21_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_12_12_world_2016_08_21_00_world.sql
index 6a6e7a9a22c..6a6e7a9a22c 100644
--- a/sql/updates/world/master/2017_02_12_12_world_2016_08_21_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_12_12_world_2016_08_21_00_world.sql
diff --git a/sql/updates/world/master/2017_02_12_13_world_2016_08_21_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_12_13_world_2016_08_21_01_world.sql
index 37ce1e9809f..37ce1e9809f 100644
--- a/sql/updates/world/master/2017_02_12_13_world_2016_08_21_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_12_13_world_2016_08_21_01_world.sql
diff --git a/sql/updates/world/master/2017_02_12_14_world_2016_08_21_02_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_12_14_world_2016_08_21_02_world.sql
index 9ae243c4db1..9ae243c4db1 100644
--- a/sql/updates/world/master/2017_02_12_14_world_2016_08_21_02_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_12_14_world_2016_08_21_02_world.sql
diff --git a/sql/updates/world/master/2017_02_13_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_13_00_world.sql
index e821a26c9be..e821a26c9be 100644
--- a/sql/updates/world/master/2017_02_13_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_13_00_world.sql
diff --git a/sql/updates/world/master/2017_02_13_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_13_01_world.sql
index e2b75f0e260..e2b75f0e260 100644
--- a/sql/updates/world/master/2017_02_13_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_13_01_world.sql
diff --git a/sql/updates/world/master/2017_02_15_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_15_00_world.sql
index c4a4b2f7ceb..c4a4b2f7ceb 100644
--- a/sql/updates/world/master/2017_02_15_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_15_00_world.sql
diff --git a/sql/updates/world/master/2017_02_17_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_17_00_world.sql
index 496f801f8a9..496f801f8a9 100644
--- a/sql/updates/world/master/2017_02_17_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_17_00_world.sql
diff --git a/sql/updates/world/master/2017_02_18_00_world_2016_08_21_03_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_18_00_world_2016_08_21_03_world.sql
index 37a59cff386..37a59cff386 100644
--- a/sql/updates/world/master/2017_02_18_00_world_2016_08_21_03_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_18_00_world_2016_08_21_03_world.sql
diff --git a/sql/updates/world/master/2017_02_18_01_world_2016_08_21_04_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_18_01_world_2016_08_21_04_world.sql
index 7d7fbd23005..7d7fbd23005 100644
--- a/sql/updates/world/master/2017_02_18_01_world_2016_08_21_04_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_18_01_world_2016_08_21_04_world.sql
diff --git a/sql/updates/world/master/2017_02_18_02_world_2016_08_21_05_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_18_02_world_2016_08_21_05_world.sql
index e7327102a1f..e7327102a1f 100644
--- a/sql/updates/world/master/2017_02_18_02_world_2016_08_21_05_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_18_02_world_2016_08_21_05_world.sql
diff --git a/sql/updates/world/master/2017_02_18_03_world_2016_08_21_06_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_18_03_world_2016_08_21_06_world.sql
index 22fce10b220..22fce10b220 100644
--- a/sql/updates/world/master/2017_02_18_03_world_2016_08_21_06_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_18_03_world_2016_08_21_06_world.sql
diff --git a/sql/updates/world/master/2017_02_18_04_world_2016_08_21_07_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_18_04_world_2016_08_21_07_world.sql
index 62d1963db90..62d1963db90 100644
--- a/sql/updates/world/master/2017_02_18_04_world_2016_08_21_07_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_18_04_world_2016_08_21_07_world.sql
diff --git a/sql/updates/world/master/2017_02_18_05_world_2016_08_22_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_18_05_world_2016_08_22_00_world.sql
index 3b741e03565..3b741e03565 100644
--- a/sql/updates/world/master/2017_02_18_05_world_2016_08_22_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_18_05_world_2016_08_22_00_world.sql
diff --git a/sql/updates/world/master/2017_02_18_06_world_2016_08_23_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_18_06_world_2016_08_23_00_world.sql
index 22a4ef95f4e..22a4ef95f4e 100644
--- a/sql/updates/world/master/2017_02_18_06_world_2016_08_23_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_18_06_world_2016_08_23_00_world.sql
diff --git a/sql/updates/world/master/2017_02_18_07_world_2016_08_23_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_18_07_world_2016_08_23_01_world.sql
index 0c266a2e88f..0c266a2e88f 100644
--- a/sql/updates/world/master/2017_02_18_07_world_2016_08_23_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_18_07_world_2016_08_23_01_world.sql
diff --git a/sql/updates/world/master/2017_02_18_08_world_2016_08_23_02_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_18_08_world_2016_08_23_02_world.sql
index 144a4aa4377..144a4aa4377 100644
--- a/sql/updates/world/master/2017_02_18_08_world_2016_08_23_02_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_18_08_world_2016_08_23_02_world.sql
diff --git a/sql/updates/world/master/2017_02_18_09_world_2016_08_23_03_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_18_09_world_2016_08_23_03_world.sql
index 727544cd88c..727544cd88c 100644
--- a/sql/updates/world/master/2017_02_18_09_world_2016_08_23_03_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_18_09_world_2016_08_23_03_world.sql
diff --git a/sql/updates/world/master/2017_02_18_10_world_2016_08_23_04_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_18_10_world_2016_08_23_04_world.sql
index d7697d28ad7..d7697d28ad7 100644
--- a/sql/updates/world/master/2017_02_18_10_world_2016_08_23_04_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_18_10_world_2016_08_23_04_world.sql
diff --git a/sql/updates/world/master/2017_02_18_11_world_2016_08_23_05_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_18_11_world_2016_08_23_05_world.sql
index cab7e8f3a20..cab7e8f3a20 100644
--- a/sql/updates/world/master/2017_02_18_11_world_2016_08_23_05_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_18_11_world_2016_08_23_05_world.sql
diff --git a/sql/updates/world/master/2017_02_18_12_world_2016_08_24_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_18_12_world_2016_08_24_00_world.sql
index 1fe0c203b63..1fe0c203b63 100644
--- a/sql/updates/world/master/2017_02_18_12_world_2016_08_24_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_18_12_world_2016_08_24_00_world.sql
diff --git a/sql/updates/world/master/2017_02_18_13_world_2016_08_24_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_18_13_world_2016_08_24_01_world.sql
index 65efdb08659..65efdb08659 100644
--- a/sql/updates/world/master/2017_02_18_13_world_2016_08_24_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_18_13_world_2016_08_24_01_world.sql
diff --git a/sql/updates/world/master/2017_02_18_14_world_2016_08_24_02_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_18_14_world_2016_08_24_02_world.sql
index e1407e23780..e1407e23780 100644
--- a/sql/updates/world/master/2017_02_18_14_world_2016_08_24_02_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_18_14_world_2016_08_24_02_world.sql
diff --git a/sql/updates/world/master/2017_02_18_15_world_2016_08_24_03_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_18_15_world_2016_08_24_03_world.sql
index 68b4d9274ec..68b4d9274ec 100644
--- a/sql/updates/world/master/2017_02_18_15_world_2016_08_24_03_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_18_15_world_2016_08_24_03_world.sql
diff --git a/sql/updates/world/master/2017_02_18_16_world_2016_08_24_06_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_18_16_world_2016_08_24_06_world.sql
index 964b1316033..964b1316033 100644
--- a/sql/updates/world/master/2017_02_18_16_world_2016_08_24_06_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_18_16_world_2016_08_24_06_world.sql
diff --git a/sql/updates/world/master/2017_02_18_17_world_2016_08_24_07_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_18_17_world_2016_08_24_07_world.sql
index 7eae175ce51..7eae175ce51 100644
--- a/sql/updates/world/master/2017_02_18_17_world_2016_08_24_07_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_18_17_world_2016_08_24_07_world.sql
diff --git a/sql/updates/world/master/2017_02_18_18_world_2016_08_24_08_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_18_18_world_2016_08_24_08_world.sql
index c024eb80824..c024eb80824 100644
--- a/sql/updates/world/master/2017_02_18_18_world_2016_08_24_08_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_18_18_world_2016_08_24_08_world.sql
diff --git a/sql/updates/world/master/2017_02_18_19_world_2016_08_24_10_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_18_19_world_2016_08_24_10_world.sql
index 1df425411bf..1df425411bf 100644
--- a/sql/updates/world/master/2017_02_18_19_world_2016_08_24_10_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_18_19_world_2016_08_24_10_world.sql
diff --git a/sql/updates/world/master/2017_02_18_20_world_2016_08_25_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_18_20_world_2016_08_25_00_world.sql
index 5118815de6f..5118815de6f 100644
--- a/sql/updates/world/master/2017_02_18_20_world_2016_08_25_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_18_20_world_2016_08_25_00_world.sql
diff --git a/sql/updates/world/master/2017_02_18_21_world_2016_08_25_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_18_21_world_2016_08_25_01_world.sql
index a1af94861e2..a1af94861e2 100644
--- a/sql/updates/world/master/2017_02_18_21_world_2016_08_25_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_18_21_world_2016_08_25_01_world.sql
diff --git a/sql/updates/world/master/2017_02_18_22_world_2016_08_25_02_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_18_22_world_2016_08_25_02_world.sql
index f8cfc381e69..f8cfc381e69 100644
--- a/sql/updates/world/master/2017_02_18_22_world_2016_08_25_02_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_18_22_world_2016_08_25_02_world.sql
diff --git a/sql/updates/world/master/2017_02_18_23_world_2016_08_25_03_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_18_23_world_2016_08_25_03_world.sql
index 531ea2621f2..531ea2621f2 100644
--- a/sql/updates/world/master/2017_02_18_23_world_2016_08_25_03_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_18_23_world_2016_08_25_03_world.sql
diff --git a/sql/updates/world/master/2017_02_18_24_world_2016_08_25_04_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_18_24_world_2016_08_25_04_world.sql
index 88a899064e1..88a899064e1 100644
--- a/sql/updates/world/master/2017_02_18_24_world_2016_08_25_04_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_18_24_world_2016_08_25_04_world.sql
diff --git a/sql/updates/world/master/2017_02_18_25_world_2016_08_25_05_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_18_25_world_2016_08_25_05_world.sql
index 75b89a1159f..75b89a1159f 100644
--- a/sql/updates/world/master/2017_02_18_25_world_2016_08_25_05_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_18_25_world_2016_08_25_05_world.sql
diff --git a/sql/updates/world/master/2017_02_18_26_world_2016_08_25_06_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_18_26_world_2016_08_25_06_world.sql
index 46768252e26..46768252e26 100644
--- a/sql/updates/world/master/2017_02_18_26_world_2016_08_25_06_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_18_26_world_2016_08_25_06_world.sql
diff --git a/sql/updates/world/master/2017_02_18_27_world_2016_08_25_08_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_18_27_world_2016_08_25_08_world.sql
index 1af4d154e31..1af4d154e31 100644
--- a/sql/updates/world/master/2017_02_18_27_world_2016_08_25_08_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_18_27_world_2016_08_25_08_world.sql
diff --git a/sql/updates/world/master/2017_02_18_28_world_2016_08_25_09_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_18_28_world_2016_08_25_09_world.sql
index 0a74b2b1eea..0a74b2b1eea 100644
--- a/sql/updates/world/master/2017_02_18_28_world_2016_08_25_09_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_18_28_world_2016_08_25_09_world.sql
diff --git a/sql/updates/world/master/2017_02_18_29_world_2016_08_25_10_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_18_29_world_2016_08_25_10_world.sql
index 05c9a250a2d..05c9a250a2d 100644
--- a/sql/updates/world/master/2017_02_18_29_world_2016_08_25_10_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_18_29_world_2016_08_25_10_world.sql
diff --git a/sql/updates/world/master/2017_02_18_30_world_2016_08_28_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_18_30_world_2016_08_28_00_world.sql
index 828b70e60c3..828b70e60c3 100644
--- a/sql/updates/world/master/2017_02_18_30_world_2016_08_28_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_18_30_world_2016_08_28_00_world.sql
diff --git a/sql/updates/world/master/2017_02_18_31_world_2016_05_02_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_18_31_world_2016_05_02_01_world.sql
index 1671abee38f..1671abee38f 100644
--- a/sql/updates/world/master/2017_02_18_31_world_2016_05_02_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_18_31_world_2016_05_02_01_world.sql
diff --git a/sql/updates/world/master/2017_02_18_32_world_2016_08_31_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_18_32_world_2016_08_31_00_world.sql
index f36064ae6f2..f36064ae6f2 100644
--- a/sql/updates/world/master/2017_02_18_32_world_2016_08_31_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_18_32_world_2016_08_31_00_world.sql
diff --git a/sql/updates/world/master/2017_02_18_33_world_2016_09_01_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_18_33_world_2016_09_01_00_world.sql
index ccb48a9c87a..ccb48a9c87a 100644
--- a/sql/updates/world/master/2017_02_18_33_world_2016_09_01_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_18_33_world_2016_09_01_00_world.sql
diff --git a/sql/updates/world/master/2017_02_18_34_world_2016_09_01_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_18_34_world_2016_09_01_01_world.sql
index a61022b2b27..a61022b2b27 100644
--- a/sql/updates/world/master/2017_02_18_34_world_2016_09_01_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_18_34_world_2016_09_01_01_world.sql
diff --git a/sql/updates/world/master/2017_02_18_35_world_2016_09_02_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_18_35_world_2016_09_02_00_world.sql
index 32e9f51bbaa..32e9f51bbaa 100644
--- a/sql/updates/world/master/2017_02_18_35_world_2016_09_02_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_18_35_world_2016_09_02_00_world.sql
diff --git a/sql/updates/world/master/2017_02_18_36_world_2016_09_02_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_18_36_world_2016_09_02_01_world.sql
index 08571cd4ea4..08571cd4ea4 100644
--- a/sql/updates/world/master/2017_02_18_36_world_2016_09_02_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_18_36_world_2016_09_02_01_world.sql
diff --git a/sql/updates/world/master/2017_02_18_37_world_2016_09_02_02_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_18_37_world_2016_09_02_02_world.sql
index 14076c60b5d..14076c60b5d 100644
--- a/sql/updates/world/master/2017_02_18_37_world_2016_09_02_02_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_18_37_world_2016_09_02_02_world.sql
diff --git a/sql/updates/world/master/2017_02_19_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_19_00_world.sql
index 13d627c516c..13d627c516c 100644
--- a/sql/updates/world/master/2017_02_19_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_19_00_world.sql
diff --git a/sql/updates/world/master/2017_02_19_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_19_01_world.sql
index 70260fe254e..70260fe254e 100644
--- a/sql/updates/world/master/2017_02_19_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_19_01_world.sql
diff --git a/sql/updates/world/master/2017_02_19_02_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_19_02_world.sql
index d729bb7c735..d729bb7c735 100644
--- a/sql/updates/world/master/2017_02_19_02_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_19_02_world.sql
diff --git a/sql/updates/world/master/2017_02_19_03_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_19_03_world.sql
index 123c42a0599..123c42a0599 100644
--- a/sql/updates/world/master/2017_02_19_03_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_19_03_world.sql
diff --git a/sql/updates/world/master/2017_02_19_04_world_2016_09_02_03_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_19_04_world_2016_09_02_03_world.sql
index 435919c5071..435919c5071 100644
--- a/sql/updates/world/master/2017_02_19_04_world_2016_09_02_03_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_19_04_world_2016_09_02_03_world.sql
diff --git a/sql/updates/world/master/2017_02_19_05_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_19_05_world.sql
index c0e99617bd7..c0e99617bd7 100644
--- a/sql/updates/world/master/2017_02_19_05_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_19_05_world.sql
diff --git a/sql/updates/world/master/2017_02_20_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_20_00_world.sql
index 8ab7e71bc40..8ab7e71bc40 100644
--- a/sql/updates/world/master/2017_02_20_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_20_00_world.sql
diff --git a/sql/updates/world/master/2017_02_25_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_25_00_world.sql
index aa9bfa90331..aa9bfa90331 100644
--- a/sql/updates/world/master/2017_02_25_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_25_00_world.sql
diff --git a/sql/updates/world/master/2017_02_26_00_world_2016_09_04_02_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_26_00_world_2016_09_04_02_world.sql
index b24829f50b2..b24829f50b2 100644
--- a/sql/updates/world/master/2017_02_26_00_world_2016_09_04_02_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_26_00_world_2016_09_04_02_world.sql
diff --git a/sql/updates/world/master/2017_02_26_01_world_2016_09_04_03_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_26_01_world_2016_09_04_03_world.sql
index 34cb1c0aa55..34cb1c0aa55 100644
--- a/sql/updates/world/master/2017_02_26_01_world_2016_09_04_03_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_26_01_world_2016_09_04_03_world.sql
diff --git a/sql/updates/world/master/2017_02_26_02_world_2016_09_09_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_26_02_world_2016_09_09_00_world.sql
index 4224931f41b..4224931f41b 100644
--- a/sql/updates/world/master/2017_02_26_02_world_2016_09_09_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_26_02_world_2016_09_09_00_world.sql
diff --git a/sql/updates/world/master/2017_02_26_03_world_2016_09_09_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_26_03_world_2016_09_09_01_world.sql
index addcd9c17dd..addcd9c17dd 100644
--- a/sql/updates/world/master/2017_02_26_03_world_2016_09_09_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_26_03_world_2016_09_09_01_world.sql
diff --git a/sql/updates/world/master/2017_02_26_04_world_2016_09_09_02_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_26_04_world_2016_09_09_02_world.sql
index 2f0395782b4..2f0395782b4 100644
--- a/sql/updates/world/master/2017_02_26_04_world_2016_09_09_02_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_26_04_world_2016_09_09_02_world.sql
diff --git a/sql/updates/world/master/2017_02_26_05_world_2016_09_10_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_26_05_world_2016_09_10_00_world.sql
index 106c46b7f42..106c46b7f42 100644
--- a/sql/updates/world/master/2017_02_26_05_world_2016_09_10_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_26_05_world_2016_09_10_00_world.sql
diff --git a/sql/updates/world/master/2017_02_26_06_world_2016_09_10_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_26_06_world_2016_09_10_01_world.sql
index af49f044a2a..af49f044a2a 100644
--- a/sql/updates/world/master/2017_02_26_06_world_2016_09_10_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_26_06_world_2016_09_10_01_world.sql
diff --git a/sql/updates/world/master/2017_02_26_07_world_2016_09_10_02_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_26_07_world_2016_09_10_02_world.sql
index eb95f2e9396..eb95f2e9396 100644
--- a/sql/updates/world/master/2017_02_26_07_world_2016_09_10_02_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_26_07_world_2016_09_10_02_world.sql
diff --git a/sql/updates/world/master/2017_02_26_08_world_2016_09_10_04_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_26_08_world_2016_09_10_04_world.sql
index 2ca196d5c42..2ca196d5c42 100644
--- a/sql/updates/world/master/2017_02_26_08_world_2016_09_10_04_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_26_08_world_2016_09_10_04_world.sql
diff --git a/sql/updates/world/master/2017_02_26_09_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_26_09_world.sql
index cac65626ead..cac65626ead 100644
--- a/sql/updates/world/master/2017_02_26_09_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_26_09_world.sql
diff --git a/sql/updates/world/master/2017_02_26_10_world_2016_09_10_05_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_26_10_world_2016_09_10_05_world.sql
index f7e34beee09..f7e34beee09 100644
--- a/sql/updates/world/master/2017_02_26_10_world_2016_09_10_05_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_26_10_world_2016_09_10_05_world.sql
diff --git a/sql/updates/world/master/2017_02_26_11_world_2016_09_10_06_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_26_11_world_2016_09_10_06_world.sql
index e9a4550993c..e9a4550993c 100644
--- a/sql/updates/world/master/2017_02_26_11_world_2016_09_10_06_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_26_11_world_2016_09_10_06_world.sql
diff --git a/sql/updates/world/master/2017_02_26_12_world_2016_09_11_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_26_12_world_2016_09_11_00_world.sql
index bb3ed000b01..bb3ed000b01 100644
--- a/sql/updates/world/master/2017_02_26_12_world_2016_09_11_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_26_12_world_2016_09_11_00_world.sql
diff --git a/sql/updates/world/master/2017_02_26_13_world_2016_09_11_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_26_13_world_2016_09_11_01_world.sql
index 9989479405f..9989479405f 100644
--- a/sql/updates/world/master/2017_02_26_13_world_2016_09_11_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_26_13_world_2016_09_11_01_world.sql
diff --git a/sql/updates/world/master/2017_02_26_14_world_2016_09_12_02_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_26_14_world_2016_09_12_02_world.sql
index f573d920bd1..f573d920bd1 100644
--- a/sql/updates/world/master/2017_02_26_14_world_2016_09_12_02_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_26_14_world_2016_09_12_02_world.sql
diff --git a/sql/updates/world/master/2017_02_26_15_world_2016_09_13_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_26_15_world_2016_09_13_00_world.sql
index 82a1eee79c6..82a1eee79c6 100644
--- a/sql/updates/world/master/2017_02_26_15_world_2016_09_13_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_26_15_world_2016_09_13_00_world.sql
diff --git a/sql/updates/world/master/2017_02_26_16_world_2016_09_13_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_26_16_world_2016_09_13_01_world.sql
index bf9120a1b28..bf9120a1b28 100644
--- a/sql/updates/world/master/2017_02_26_16_world_2016_09_13_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_26_16_world_2016_09_13_01_world.sql
diff --git a/sql/updates/world/master/2017_02_26_17_world_2016_09_13_04_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_26_17_world_2016_09_13_04_world.sql
index dfe1a52f514..dfe1a52f514 100644
--- a/sql/updates/world/master/2017_02_26_17_world_2016_09_13_04_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_26_17_world_2016_09_13_04_world.sql
diff --git a/sql/updates/world/master/2017_02_26_18_world_2016_09_13_06_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_26_18_world_2016_09_13_06_world.sql
index fc385361a66..fc385361a66 100644
--- a/sql/updates/world/master/2017_02_26_18_world_2016_09_13_06_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_26_18_world_2016_09_13_06_world.sql
diff --git a/sql/updates/world/master/2017_02_26_19_world_2016_09_14_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_26_19_world_2016_09_14_01_world.sql
index baf64ae3ff6..baf64ae3ff6 100644
--- a/sql/updates/world/master/2017_02_26_19_world_2016_09_14_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_26_19_world_2016_09_14_01_world.sql
diff --git a/sql/updates/world/master/2017_02_26_20_world_2016_09_14_02_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_26_20_world_2016_09_14_02_world.sql
index 9f1a2d520e9..9f1a2d520e9 100644
--- a/sql/updates/world/master/2017_02_26_20_world_2016_09_14_02_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_26_20_world_2016_09_14_02_world.sql
diff --git a/sql/updates/world/master/2017_02_26_21_world_2016_09_14_03_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_26_21_world_2016_09_14_03_world.sql
index 3018e2bbe6f..3018e2bbe6f 100644
--- a/sql/updates/world/master/2017_02_26_21_world_2016_09_14_03_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_26_21_world_2016_09_14_03_world.sql
diff --git a/sql/updates/world/master/2017_02_27_00_world_2016_09_14_04_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_27_00_world_2016_09_14_04_world.sql
index 85f9b4f7faa..85f9b4f7faa 100644
--- a/sql/updates/world/master/2017_02_27_00_world_2016_09_14_04_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_27_00_world_2016_09_14_04_world.sql
diff --git a/sql/updates/world/master/2017_02_27_01_world_2016_09_15_02_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_27_01_world_2016_09_15_02_world.sql
index 8dedfaa30e4..8dedfaa30e4 100644
--- a/sql/updates/world/master/2017_02_27_01_world_2016_09_15_02_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_27_01_world_2016_09_15_02_world.sql
diff --git a/sql/updates/world/master/2017_02_27_02_world_2016_09_15_03_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_27_02_world_2016_09_15_03_world.sql
index ab31a870df2..ab31a870df2 100644
--- a/sql/updates/world/master/2017_02_27_02_world_2016_09_15_03_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_27_02_world_2016_09_15_03_world.sql
diff --git a/sql/updates/world/master/2017_02_28_00_world_2016_09_15_05_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_28_00_world_2016_09_15_05_world.sql
index edafdb6aad5..edafdb6aad5 100644
--- a/sql/updates/world/master/2017_02_28_00_world_2016_09_15_05_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_28_00_world_2016_09_15_05_world.sql
diff --git a/sql/updates/world/master/2017_02_28_01_world_2016_09_15_06_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_28_01_world_2016_09_15_06_world.sql
index d04da5da225..d04da5da225 100644
--- a/sql/updates/world/master/2017_02_28_01_world_2016_09_15_06_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_28_01_world_2016_09_15_06_world.sql
diff --git a/sql/updates/world/master/2017_02_28_02_world_2016_09_15_07_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_28_02_world_2016_09_15_07_world.sql
index 3180f10b34d..3180f10b34d 100644
--- a/sql/updates/world/master/2017_02_28_02_world_2016_09_15_07_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_28_02_world_2016_09_15_07_world.sql
diff --git a/sql/updates/world/master/2017_02_28_03_world_2016_09_16_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_28_03_world_2016_09_16_00_world.sql
index 6be2cafd66d..6be2cafd66d 100644
--- a/sql/updates/world/master/2017_02_28_03_world_2016_09_16_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_28_03_world_2016_09_16_00_world.sql
diff --git a/sql/updates/world/master/2017_02_28_04_world_2016_09_16_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_28_04_world_2016_09_16_01_world.sql
index c170b292cfa..c170b292cfa 100644
--- a/sql/updates/world/master/2017_02_28_04_world_2016_09_16_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_28_04_world_2016_09_16_01_world.sql
diff --git a/sql/updates/world/master/2017_02_28_05_world_2016_09_16_02_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_28_05_world_2016_09_16_02_world.sql
index 31ffcd005e8..31ffcd005e8 100644
--- a/sql/updates/world/master/2017_02_28_05_world_2016_09_16_02_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_28_05_world_2016_09_16_02_world.sql
diff --git a/sql/updates/world/master/2017_02_28_06_world_2016_09_16_03_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_28_06_world_2016_09_16_03_world.sql
index b0d106e63da..b0d106e63da 100644
--- a/sql/updates/world/master/2017_02_28_06_world_2016_09_16_03_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_28_06_world_2016_09_16_03_world.sql
diff --git a/sql/updates/world/master/2017_02_28_07_world_2016_09_16_04_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_28_07_world_2016_09_16_04_world.sql
index 10c2f5b0ae1..10c2f5b0ae1 100644
--- a/sql/updates/world/master/2017_02_28_07_world_2016_09_16_04_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_28_07_world_2016_09_16_04_world.sql
diff --git a/sql/updates/world/master/2017_02_28_08_world_2016_09_16_05_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_28_08_world_2016_09_16_05_world.sql
index 4957b7407be..4957b7407be 100644
--- a/sql/updates/world/master/2017_02_28_08_world_2016_09_16_05_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_28_08_world_2016_09_16_05_world.sql
diff --git a/sql/updates/world/master/2017_02_28_09_world_2016_09_16_06_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_28_09_world_2016_09_16_06_world.sql
index b034f70dd2d..b034f70dd2d 100644
--- a/sql/updates/world/master/2017_02_28_09_world_2016_09_16_06_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_28_09_world_2016_09_16_06_world.sql
diff --git a/sql/updates/world/master/2017_02_28_10_world_2016_09_16_07_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_28_10_world_2016_09_16_07_world.sql
index 478b693e344..478b693e344 100644
--- a/sql/updates/world/master/2017_02_28_10_world_2016_09_16_07_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_28_10_world_2016_09_16_07_world.sql
diff --git a/sql/updates/world/master/2017_02_28_11_world_2016_09_16_08_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_28_11_world_2016_09_16_08_world.sql
index 2d2efb6640f..2d2efb6640f 100644
--- a/sql/updates/world/master/2017_02_28_11_world_2016_09_16_08_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_28_11_world_2016_09_16_08_world.sql
diff --git a/sql/updates/world/master/2017_02_28_12_world_2016_09_17_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_02_28_12_world_2016_09_17_00_world.sql
index 105576bd492..105576bd492 100644
--- a/sql/updates/world/master/2017_02_28_12_world_2016_09_17_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_02_28_12_world_2016_09_17_00_world.sql
diff --git a/sql/updates/world/master/2017_03_01_00_world_2016_09_19_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_01_00_world_2016_09_19_00_world.sql
index 86e9a84a764..86e9a84a764 100644
--- a/sql/updates/world/master/2017_03_01_00_world_2016_09_19_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_01_00_world_2016_09_19_00_world.sql
diff --git a/sql/updates/world/master/2017_03_01_01_world_2016_09_19_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_01_01_world_2016_09_19_01_world.sql
index 01390902e37..01390902e37 100644
--- a/sql/updates/world/master/2017_03_01_01_world_2016_09_19_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_01_01_world_2016_09_19_01_world.sql
diff --git a/sql/updates/world/master/2017_03_01_02_world_2016_09_19_02_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_01_02_world_2016_09_19_02_world.sql
index d210aab8164..d210aab8164 100644
--- a/sql/updates/world/master/2017_03_01_02_world_2016_09_19_02_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_01_02_world_2016_09_19_02_world.sql
diff --git a/sql/updates/world/master/2017_03_01_03_world_2016_09_19_04_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_01_03_world_2016_09_19_04_world.sql
index e5e76063510..e5e76063510 100644
--- a/sql/updates/world/master/2017_03_01_03_world_2016_09_19_04_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_01_03_world_2016_09_19_04_world.sql
diff --git a/sql/updates/world/master/2017_03_01_04_world_2016_09_19_05_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_01_04_world_2016_09_19_05_world.sql
index e72b0a84696..e72b0a84696 100644
--- a/sql/updates/world/master/2017_03_01_04_world_2016_09_19_05_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_01_04_world_2016_09_19_05_world.sql
diff --git a/sql/updates/world/master/2017_03_01_05_world_2016_09_19_06_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_01_05_world_2016_09_19_06_world.sql
index a512b53cf79..a512b53cf79 100644
--- a/sql/updates/world/master/2017_03_01_05_world_2016_09_19_06_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_01_05_world_2016_09_19_06_world.sql
diff --git a/sql/updates/world/master/2017_03_01_06_world_2016_09_19_07_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_01_06_world_2016_09_19_07_world.sql
index e43b6a1ee76..e43b6a1ee76 100644
--- a/sql/updates/world/master/2017_03_01_06_world_2016_09_19_07_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_01_06_world_2016_09_19_07_world.sql
diff --git a/sql/updates/world/master/2017_03_01_07_world_2016_09_20_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_01_07_world_2016_09_20_00_world.sql
index ae2caf249f9..ae2caf249f9 100644
--- a/sql/updates/world/master/2017_03_01_07_world_2016_09_20_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_01_07_world_2016_09_20_00_world.sql
diff --git a/sql/updates/world/master/2017_03_02_00_world_2016_09_20_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_02_00_world_2016_09_20_01_world.sql
index 1e9d6aa08a6..1e9d6aa08a6 100644
--- a/sql/updates/world/master/2017_03_02_00_world_2016_09_20_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_02_00_world_2016_09_20_01_world.sql
diff --git a/sql/updates/world/master/2017_03_02_01_world_2016_09_20_02_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_02_01_world_2016_09_20_02_world.sql
index 5a4e5f7fae5..5a4e5f7fae5 100644
--- a/sql/updates/world/master/2017_03_02_01_world_2016_09_20_02_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_02_01_world_2016_09_20_02_world.sql
diff --git a/sql/updates/world/master/2017_03_02_02_world_2016_09_20_03_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_02_02_world_2016_09_20_03_world.sql
index 4ddec12e3b3..4ddec12e3b3 100644
--- a/sql/updates/world/master/2017_03_02_02_world_2016_09_20_03_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_02_02_world_2016_09_20_03_world.sql
diff --git a/sql/updates/world/master/2017_03_02_03_world_2016_09_20_04_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_02_03_world_2016_09_20_04_world.sql
index a786a86cfba..a786a86cfba 100644
--- a/sql/updates/world/master/2017_03_02_03_world_2016_09_20_04_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_02_03_world_2016_09_20_04_world.sql
diff --git a/sql/updates/world/master/2017_03_02_04_world_2016_09_21_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_02_04_world_2016_09_21_00_world.sql
index 425b48ee320..425b48ee320 100644
--- a/sql/updates/world/master/2017_03_02_04_world_2016_09_21_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_02_04_world_2016_09_21_00_world.sql
diff --git a/sql/updates/world/master/2017_03_02_05_world_2016_09_21_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_02_05_world_2016_09_21_01_world.sql
index c8dc9b1f7ac..c8dc9b1f7ac 100644
--- a/sql/updates/world/master/2017_03_02_05_world_2016_09_21_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_02_05_world_2016_09_21_01_world.sql
diff --git a/sql/updates/world/master/2017_03_02_06_world_2016_09_21_02_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_02_06_world_2016_09_21_02_world.sql
index 12306b80b93..12306b80b93 100644
--- a/sql/updates/world/master/2017_03_02_06_world_2016_09_21_02_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_02_06_world_2016_09_21_02_world.sql
diff --git a/sql/updates/world/master/2017_03_02_07_world_2016_09_21_03_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_02_07_world_2016_09_21_03_world.sql
index bcedb4c0857..bcedb4c0857 100644
--- a/sql/updates/world/master/2017_03_02_07_world_2016_09_21_03_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_02_07_world_2016_09_21_03_world.sql
diff --git a/sql/updates/world/master/2017_03_02_08_world_2016_09_21_04_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_02_08_world_2016_09_21_04_world.sql
index 0587b286081..0587b286081 100644
--- a/sql/updates/world/master/2017_03_02_08_world_2016_09_21_04_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_02_08_world_2016_09_21_04_world.sql
diff --git a/sql/updates/world/master/2017_03_03_00_world_2016_09_22_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_03_00_world_2016_09_22_00_world.sql
index 92f965a1691..92f965a1691 100644
--- a/sql/updates/world/master/2017_03_03_00_world_2016_09_22_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_03_00_world_2016_09_22_00_world.sql
diff --git a/sql/updates/world/master/2017_03_03_01_world_2016_09_24_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_03_01_world_2016_09_24_00_world.sql
index fcc29fa4a75..fcc29fa4a75 100644
--- a/sql/updates/world/master/2017_03_03_01_world_2016_09_24_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_03_01_world_2016_09_24_00_world.sql
diff --git a/sql/updates/world/master/2017_03_03_02_world_2016_09_24_01_world_335.sql b/sql/old/7/world/00_2017_04_18/2017_03_03_02_world_2016_09_24_01_world_335.sql
index 3a319743e41..3a319743e41 100644
--- a/sql/updates/world/master/2017_03_03_02_world_2016_09_24_01_world_335.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_03_02_world_2016_09_24_01_world_335.sql
diff --git a/sql/updates/world/master/2017_03_03_03_world_2016_09_24_02_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_03_03_world_2016_09_24_02_world.sql
index 483cefea9a3..483cefea9a3 100644
--- a/sql/updates/world/master/2017_03_03_03_world_2016_09_24_02_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_03_03_world_2016_09_24_02_world.sql
diff --git a/sql/updates/world/master/2017_03_03_04_world_2016_09_24_03_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_03_04_world_2016_09_24_03_world.sql
index 6d6de7a77cd..6d6de7a77cd 100644
--- a/sql/updates/world/master/2017_03_03_04_world_2016_09_24_03_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_03_04_world_2016_09_24_03_world.sql
diff --git a/sql/updates/world/master/2017_03_03_05_world_2016_09_24_04_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_03_05_world_2016_09_24_04_world.sql
index c799ff2899f..c799ff2899f 100644
--- a/sql/updates/world/master/2017_03_03_05_world_2016_09_24_04_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_03_05_world_2016_09_24_04_world.sql
diff --git a/sql/updates/world/master/2017_03_03_06_world_2016_09_24_05_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_03_06_world_2016_09_24_05_world.sql
index 8c56984c27a..8c56984c27a 100644
--- a/sql/updates/world/master/2017_03_03_06_world_2016_09_24_05_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_03_06_world_2016_09_24_05_world.sql
diff --git a/sql/updates/world/master/2017_03_03_07_world_2016_09_24_06_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_03_07_world_2016_09_24_06_world.sql
index e0ed9379d4f..e0ed9379d4f 100644
--- a/sql/updates/world/master/2017_03_03_07_world_2016_09_24_06_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_03_07_world_2016_09_24_06_world.sql
diff --git a/sql/updates/world/master/2017_03_03_08_world_2016_09_24_08_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_03_08_world_2016_09_24_08_world.sql
index cb1a823ba43..cb1a823ba43 100644
--- a/sql/updates/world/master/2017_03_03_08_world_2016_09_24_08_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_03_08_world_2016_09_24_08_world.sql
diff --git a/sql/updates/world/master/2017_03_03_09_world_2016_09_25_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_03_09_world_2016_09_25_00_world.sql
index c48637f4f00..c48637f4f00 100644
--- a/sql/updates/world/master/2017_03_03_09_world_2016_09_25_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_03_09_world_2016_09_25_00_world.sql
diff --git a/sql/updates/world/master/2017_03_03_10_world_2016_09_25_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_03_10_world_2016_09_25_01_world.sql
index d396182bb99..d396182bb99 100644
--- a/sql/updates/world/master/2017_03_03_10_world_2016_09_25_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_03_10_world_2016_09_25_01_world.sql
diff --git a/sql/updates/world/master/2017_03_03_11_world_2016_09_25_02_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_03_11_world_2016_09_25_02_world.sql
index 6aee1a40404..6aee1a40404 100644
--- a/sql/updates/world/master/2017_03_03_11_world_2016_09_25_02_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_03_11_world_2016_09_25_02_world.sql
diff --git a/sql/updates/world/master/2017_03_03_12_world_2016_09_25_03_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_03_12_world_2016_09_25_03_world.sql
index 3d9d25539ae..3d9d25539ae 100644
--- a/sql/updates/world/master/2017_03_03_12_world_2016_09_25_03_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_03_12_world_2016_09_25_03_world.sql
diff --git a/sql/updates/world/master/2017_03_03_13_world_2016_09_25_04_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_03_13_world_2016_09_25_04_world.sql
index b38d749af4c..b38d749af4c 100644
--- a/sql/updates/world/master/2017_03_03_13_world_2016_09_25_04_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_03_13_world_2016_09_25_04_world.sql
diff --git a/sql/updates/world/master/2017_03_03_14_world_2016_09_26_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_03_14_world_2016_09_26_00_world.sql
index 72a4f8a956b..72a4f8a956b 100644
--- a/sql/updates/world/master/2017_03_03_14_world_2016_09_26_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_03_14_world_2016_09_26_00_world.sql
diff --git a/sql/updates/world/master/2017_03_03_15_world_2016_09_26_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_03_15_world_2016_09_26_01_world.sql
index 04b3804fce7..04b3804fce7 100644
--- a/sql/updates/world/master/2017_03_03_15_world_2016_09_26_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_03_15_world_2016_09_26_01_world.sql
diff --git a/sql/updates/world/master/2017_03_03_16_world_2016_09_26_03_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_03_16_world_2016_09_26_03_world.sql
index 81a2584bbe0..81a2584bbe0 100644
--- a/sql/updates/world/master/2017_03_03_16_world_2016_09_26_03_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_03_16_world_2016_09_26_03_world.sql
diff --git a/sql/updates/world/master/2017_03_03_17_world_2016_09_26_02_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_03_17_world_2016_09_26_02_world.sql
index d260efaef5b..d260efaef5b 100644
--- a/sql/updates/world/master/2017_03_03_17_world_2016_09_26_02_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_03_17_world_2016_09_26_02_world.sql
diff --git a/sql/updates/world/master/2017_03_04_00_world_2016_09_27_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_04_00_world_2016_09_27_00_world.sql
index c4458e3a9d5..c4458e3a9d5 100644
--- a/sql/updates/world/master/2017_03_04_00_world_2016_09_27_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_04_00_world_2016_09_27_00_world.sql
diff --git a/sql/updates/world/master/2017_03_04_01_world_2016_09_28_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_04_01_world_2016_09_28_00_world.sql
index fe989a9eb69..fe989a9eb69 100644
--- a/sql/updates/world/master/2017_03_04_01_world_2016_09_28_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_04_01_world_2016_09_28_00_world.sql
diff --git a/sql/updates/world/master/2017_03_04_02_world_2016_09_28_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_04_02_world_2016_09_28_01_world.sql
index 18c2b906f1d..18c2b906f1d 100644
--- a/sql/updates/world/master/2017_03_04_02_world_2016_09_28_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_04_02_world_2016_09_28_01_world.sql
diff --git a/sql/updates/world/master/2017_03_04_03_world_2016_09_28_02_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_04_03_world_2016_09_28_02_world.sql
index 08f3cc34c39..08f3cc34c39 100644
--- a/sql/updates/world/master/2017_03_04_03_world_2016_09_28_02_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_04_03_world_2016_09_28_02_world.sql
diff --git a/sql/updates/world/master/2017_03_04_04_world_2016_09_29_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_04_04_world_2016_09_29_00_world.sql
index b8541ac1e9b..b8541ac1e9b 100644
--- a/sql/updates/world/master/2017_03_04_04_world_2016_09_29_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_04_04_world_2016_09_29_00_world.sql
diff --git a/sql/updates/world/master/2017_03_04_05_world_2016_09_29_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_04_05_world_2016_09_29_01_world.sql
index 575c3963b16..575c3963b16 100644
--- a/sql/updates/world/master/2017_03_04_05_world_2016_09_29_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_04_05_world_2016_09_29_01_world.sql
diff --git a/sql/updates/world/master/2017_03_04_06_world_2016_09_29_02_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_04_06_world_2016_09_29_02_world.sql
index f2eff82a9b5..f2eff82a9b5 100644
--- a/sql/updates/world/master/2017_03_04_06_world_2016_09_29_02_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_04_06_world_2016_09_29_02_world.sql
diff --git a/sql/updates/world/master/2017_03_04_07_world_2016_09_30_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_04_07_world_2016_09_30_00_world.sql
index eb0e81c1c6e..eb0e81c1c6e 100644
--- a/sql/updates/world/master/2017_03_04_07_world_2016_09_30_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_04_07_world_2016_09_30_00_world.sql
diff --git a/sql/updates/world/master/2017_03_04_08_world_2016_09_30_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_04_08_world_2016_09_30_01_world.sql
index 830b9c17697..830b9c17697 100644
--- a/sql/updates/world/master/2017_03_04_08_world_2016_09_30_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_04_08_world_2016_09_30_01_world.sql
diff --git a/sql/updates/world/master/2017_03_04_09_world_2016_09_30_02_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_04_09_world_2016_09_30_02_world.sql
index 144edaeb99e..144edaeb99e 100644
--- a/sql/updates/world/master/2017_03_04_09_world_2016_09_30_02_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_04_09_world_2016_09_30_02_world.sql
diff --git a/sql/updates/world/master/2017_03_04_10_world_2016_09_30_03_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_04_10_world_2016_09_30_03_world.sql
index 5f0f949ad72..5f0f949ad72 100644
--- a/sql/updates/world/master/2017_03_04_10_world_2016_09_30_03_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_04_10_world_2016_09_30_03_world.sql
diff --git a/sql/updates/world/master/2017_03_04_11_world_2016_09_30_04_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_04_11_world_2016_09_30_04_world.sql
index 841f2b9cce9..841f2b9cce9 100644
--- a/sql/updates/world/master/2017_03_04_11_world_2016_09_30_04_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_04_11_world_2016_09_30_04_world.sql
diff --git a/sql/updates/world/master/2017_03_04_12_world_2016_09_30_05_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_04_12_world_2016_09_30_05_world.sql
index 8f1e401c778..8f1e401c778 100644
--- a/sql/updates/world/master/2017_03_04_12_world_2016_09_30_05_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_04_12_world_2016_09_30_05_world.sql
diff --git a/sql/updates/world/master/2017_03_04_13_world_2016_09_30_06_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_04_13_world_2016_09_30_06_world.sql
index b87a05aaa11..b87a05aaa11 100644
--- a/sql/updates/world/master/2017_03_04_13_world_2016_09_30_06_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_04_13_world_2016_09_30_06_world.sql
diff --git a/sql/updates/world/master/2017_03_04_14_world_2016_10_01_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_04_14_world_2016_10_01_00_world.sql
index 37e9d4589c0..37e9d4589c0 100644
--- a/sql/updates/world/master/2017_03_04_14_world_2016_10_01_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_04_14_world_2016_10_01_00_world.sql
diff --git a/sql/updates/world/master/2017_03_04_15_world_2016_10_01_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_04_15_world_2016_10_01_01_world.sql
index d1fb1cc034c..d1fb1cc034c 100644
--- a/sql/updates/world/master/2017_03_04_15_world_2016_10_01_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_04_15_world_2016_10_01_01_world.sql
diff --git a/sql/updates/world/master/2017_03_04_16_world_2016_10_01_02_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_04_16_world_2016_10_01_02_world.sql
index 744cf20c7ed..744cf20c7ed 100644
--- a/sql/updates/world/master/2017_03_04_16_world_2016_10_01_02_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_04_16_world_2016_10_01_02_world.sql
diff --git a/sql/updates/world/master/2017_03_04_17_world_2016_10_01_03_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_04_17_world_2016_10_01_03_world.sql
index 378e2ea918f..378e2ea918f 100644
--- a/sql/updates/world/master/2017_03_04_17_world_2016_10_01_03_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_04_17_world_2016_10_01_03_world.sql
diff --git a/sql/updates/world/master/2017_03_04_18_world_2016_10_01_04_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_04_18_world_2016_10_01_04_world.sql
index 690bd9b7294..690bd9b7294 100644
--- a/sql/updates/world/master/2017_03_04_18_world_2016_10_01_04_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_04_18_world_2016_10_01_04_world.sql
diff --git a/sql/updates/world/master/2017_03_04_19_world_2016_10_02_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_04_19_world_2016_10_02_00_world.sql
index 6ef4e4020b7..6ef4e4020b7 100644
--- a/sql/updates/world/master/2017_03_04_19_world_2016_10_02_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_04_19_world_2016_10_02_00_world.sql
diff --git a/sql/updates/world/master/2017_03_04_20_world_2016_10_02_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_04_20_world_2016_10_02_01_world.sql
index 5243121dc8c..5243121dc8c 100644
--- a/sql/updates/world/master/2017_03_04_20_world_2016_10_02_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_04_20_world_2016_10_02_01_world.sql
diff --git a/sql/updates/world/master/2017_03_04_21_world_2016_10_02_02_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_04_21_world_2016_10_02_02_world.sql
index 842f1903b9f..842f1903b9f 100644
--- a/sql/updates/world/master/2017_03_04_21_world_2016_10_02_02_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_04_21_world_2016_10_02_02_world.sql
diff --git a/sql/updates/world/master/2017_03_04_22_world_2016_10_02_03_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_04_22_world_2016_10_02_03_world.sql
index acdbac960dd..acdbac960dd 100644
--- a/sql/updates/world/master/2017_03_04_22_world_2016_10_02_03_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_04_22_world_2016_10_02_03_world.sql
diff --git a/sql/updates/world/master/2017_03_04_23_world_2016_10_02_04_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_04_23_world_2016_10_02_04_world.sql
index b184d08106d..b184d08106d 100644
--- a/sql/updates/world/master/2017_03_04_23_world_2016_10_02_04_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_04_23_world_2016_10_02_04_world.sql
diff --git a/sql/updates/world/master/2017_03_04_24_world_2016_10_02_05_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_04_24_world_2016_10_02_05_world.sql
index b6d588302d7..b6d588302d7 100644
--- a/sql/updates/world/master/2017_03_04_24_world_2016_10_02_05_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_04_24_world_2016_10_02_05_world.sql
diff --git a/sql/updates/world/master/2017_03_04_25_world_2016_10_02_06_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_04_25_world_2016_10_02_06_world.sql
index a8587231e4b..a8587231e4b 100644
--- a/sql/updates/world/master/2017_03_04_25_world_2016_10_02_06_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_04_25_world_2016_10_02_06_world.sql
diff --git a/sql/updates/world/master/2017_03_04_26_world_2016_10_02_07_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_04_26_world_2016_10_02_07_world.sql
index ceb341d4b1c..ceb341d4b1c 100644
--- a/sql/updates/world/master/2017_03_04_26_world_2016_10_02_07_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_04_26_world_2016_10_02_07_world.sql
diff --git a/sql/updates/world/master/2017_03_04_27_world_2016_10_02_08_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_04_27_world_2016_10_02_08_world.sql
index 6a7010eefc7..6a7010eefc7 100644
--- a/sql/updates/world/master/2017_03_04_27_world_2016_10_02_08_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_04_27_world_2016_10_02_08_world.sql
diff --git a/sql/updates/world/master/2017_03_04_28_world_2016_10_03_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_04_28_world_2016_10_03_00_world.sql
index 68fd91a2096..68fd91a2096 100644
--- a/sql/updates/world/master/2017_03_04_28_world_2016_10_03_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_04_28_world_2016_10_03_00_world.sql
diff --git a/sql/updates/world/master/2017_03_04_29_world_2016_10_03_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_04_29_world_2016_10_03_01_world.sql
index bef2bdc5d45..bef2bdc5d45 100644
--- a/sql/updates/world/master/2017_03_04_29_world_2016_10_03_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_04_29_world_2016_10_03_01_world.sql
diff --git a/sql/updates/world/master/2017_03_04_30_world_2016_10_03_02_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_04_30_world_2016_10_03_02_world.sql
index 217ab585e04..217ab585e04 100644
--- a/sql/updates/world/master/2017_03_04_30_world_2016_10_03_02_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_04_30_world_2016_10_03_02_world.sql
diff --git a/sql/updates/world/master/2017_03_04_31_world_2016_10_03_03_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_04_31_world_2016_10_03_03_world.sql
index c4b0ed2b301..c4b0ed2b301 100644
--- a/sql/updates/world/master/2017_03_04_31_world_2016_10_03_03_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_04_31_world_2016_10_03_03_world.sql
diff --git a/sql/updates/world/master/2017_03_04_32_world_2016_10_03_04_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_04_32_world_2016_10_03_04_world.sql
index f0718ebe6ea..f0718ebe6ea 100644
--- a/sql/updates/world/master/2017_03_04_32_world_2016_10_03_04_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_04_32_world_2016_10_03_04_world.sql
diff --git a/sql/updates/world/master/2017_03_05_00_world_2016_10_04_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_05_00_world_2016_10_04_01_world.sql
index dc22b99b4ad..dc22b99b4ad 100644
--- a/sql/updates/world/master/2017_03_05_00_world_2016_10_04_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_05_00_world_2016_10_04_01_world.sql
diff --git a/sql/updates/world/master/2017_03_05_01_world_2016_10_04_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_05_01_world_2016_10_04_00_world.sql
index 5558d56650c..5558d56650c 100644
--- a/sql/updates/world/master/2017_03_05_01_world_2016_10_04_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_05_01_world_2016_10_04_00_world.sql
diff --git a/sql/updates/world/master/2017_03_05_02_world_2016_10_04_03_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_05_02_world_2016_10_04_03_world.sql
index e9e1413252e..e9e1413252e 100644
--- a/sql/updates/world/master/2017_03_05_02_world_2016_10_04_03_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_05_02_world_2016_10_04_03_world.sql
diff --git a/sql/updates/world/master/2017_03_05_03_world_2016_10_04_02_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_05_03_world_2016_10_04_02_world.sql
index b8981276d96..b8981276d96 100644
--- a/sql/updates/world/master/2017_03_05_03_world_2016_10_04_02_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_05_03_world_2016_10_04_02_world.sql
diff --git a/sql/updates/world/master/2017_03_05_04_world_2016_10_04_04_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_05_04_world_2016_10_04_04_world.sql
index 7893ed3c2f1..7893ed3c2f1 100644
--- a/sql/updates/world/master/2017_03_05_04_world_2016_10_04_04_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_05_04_world_2016_10_04_04_world.sql
diff --git a/sql/updates/world/master/2017_03_11_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_11_00_world.sql
index 2708b7e82d1..2708b7e82d1 100644
--- a/sql/updates/world/master/2017_03_11_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_11_00_world.sql
diff --git a/sql/updates/world/master/2017_03_11_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_11_01_world.sql
index b92e9524cd3..b92e9524cd3 100644
--- a/sql/updates/world/master/2017_03_11_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_11_01_world.sql
diff --git a/sql/updates/world/master/2017_03_11_02_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_11_02_world.sql
index a1e55261cfd..a1e55261cfd 100644
--- a/sql/updates/world/master/2017_03_11_02_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_11_02_world.sql
diff --git a/sql/updates/world/master/2017_03_11_03_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_11_03_world.sql
index 98a0dfc84a9..98a0dfc84a9 100644
--- a/sql/updates/world/master/2017_03_11_03_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_11_03_world.sql
diff --git a/sql/updates/world/master/2017_03_12_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_12_00_world.sql
index 6176fa8d9d8..6176fa8d9d8 100644
--- a/sql/updates/world/master/2017_03_12_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_12_00_world.sql
diff --git a/sql/updates/world/master/2017_03_13_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_13_00_world.sql
index 53d33f7dfd8..53d33f7dfd8 100644
--- a/sql/updates/world/master/2017_03_13_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_13_00_world.sql
diff --git a/sql/updates/world/master/2017_03_15_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_15_00_world.sql
index 06c9943f495..06c9943f495 100644
--- a/sql/updates/world/master/2017_03_15_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_15_00_world.sql
diff --git a/sql/updates/world/master/2017_03_15_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_15_01_world.sql
index ab3acc3dd9e..ab3acc3dd9e 100644
--- a/sql/updates/world/master/2017_03_15_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_15_01_world.sql
diff --git a/sql/updates/world/master/2017_03_15_02_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_15_02_world.sql
index 689b47dbf15..689b47dbf15 100644
--- a/sql/updates/world/master/2017_03_15_02_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_15_02_world.sql
diff --git a/sql/updates/world/master/2017_03_15_03_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_15_03_world.sql
index 491618bfe0b..491618bfe0b 100644
--- a/sql/updates/world/master/2017_03_15_03_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_15_03_world.sql
diff --git a/sql/updates/world/master/2017_03_15_04_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_15_04_world.sql
index 8340beb7590..8340beb7590 100644
--- a/sql/updates/world/master/2017_03_15_04_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_15_04_world.sql
diff --git a/sql/updates/world/master/2017_03_15_05_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_15_05_world.sql
index 3a33cd9a70b..3a33cd9a70b 100644
--- a/sql/updates/world/master/2017_03_15_05_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_15_05_world.sql
diff --git a/sql/updates/world/master/2017_03_16_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_16_00_world.sql
index 829295021f9..829295021f9 100644
--- a/sql/updates/world/master/2017_03_16_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_16_00_world.sql
diff --git a/sql/updates/world/master/2017_03_16_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_16_01_world.sql
index d06d55d2428..d06d55d2428 100644
--- a/sql/updates/world/master/2017_03_16_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_16_01_world.sql
diff --git a/sql/updates/world/master/2017_03_16_02_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_16_02_world.sql
index 1f30e6a4dea..1f30e6a4dea 100644
--- a/sql/updates/world/master/2017_03_16_02_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_16_02_world.sql
diff --git a/sql/updates/world/master/2017_03_16_03_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_16_03_world.sql
index 6162abdaa8b..6162abdaa8b 100644
--- a/sql/updates/world/master/2017_03_16_03_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_16_03_world.sql
diff --git a/sql/updates/world/master/2017_03_17_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_17_00_world.sql
index 63d2c50c752..63d2c50c752 100644
--- a/sql/updates/world/master/2017_03_17_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_17_00_world.sql
diff --git a/sql/updates/world/master/2017_03_17_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_17_01_world.sql
index 7415cba262a..7415cba262a 100644
--- a/sql/updates/world/master/2017_03_17_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_17_01_world.sql
diff --git a/sql/updates/world/master/2017_03_17_02_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_17_02_world.sql
index 6cf7d5e7702..6cf7d5e7702 100644
--- a/sql/updates/world/master/2017_03_17_02_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_17_02_world.sql
diff --git a/sql/updates/world/master/2017_03_17_03_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_17_03_world.sql
index 82ee060f35e..82ee060f35e 100644
--- a/sql/updates/world/master/2017_03_17_03_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_17_03_world.sql
diff --git a/sql/updates/world/master/2017_03_18_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_18_00_world.sql
index cc3e2d2e47e..cc3e2d2e47e 100644
--- a/sql/updates/world/master/2017_03_18_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_18_00_world.sql
diff --git a/sql/updates/world/master/2017_03_18_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_18_01_world.sql
index 8dec2022141..8dec2022141 100644
--- a/sql/updates/world/master/2017_03_18_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_18_01_world.sql
diff --git a/sql/updates/world/master/2017_03_18_02_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_18_02_world.sql
index 2150ae08cda..2150ae08cda 100644
--- a/sql/updates/world/master/2017_03_18_02_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_18_02_world.sql
diff --git a/sql/updates/world/master/2017_03_18_03_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_18_03_world.sql
index 28248359eca..28248359eca 100644
--- a/sql/updates/world/master/2017_03_18_03_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_18_03_world.sql
diff --git a/sql/updates/world/master/2017_03_18_04_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_18_04_world.sql
index 94acf9a67f0..94acf9a67f0 100644
--- a/sql/updates/world/master/2017_03_18_04_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_18_04_world.sql
diff --git a/sql/updates/world/master/2017_03_18_05_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_18_05_world.sql
index 4ad1845378e..4ad1845378e 100644
--- a/sql/updates/world/master/2017_03_18_05_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_18_05_world.sql
diff --git a/sql/updates/world/master/2017_03_18_06_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_18_06_world.sql
index 9532eee35d3..9532eee35d3 100644
--- a/sql/updates/world/master/2017_03_18_06_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_18_06_world.sql
diff --git a/sql/updates/world/master/2017_03_18_07_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_18_07_world.sql
index 216fdb876c3..216fdb876c3 100644
--- a/sql/updates/world/master/2017_03_18_07_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_18_07_world.sql
diff --git a/sql/updates/world/master/2017_03_18_08_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_18_08_world.sql
index 452b3cd36b9..452b3cd36b9 100644
--- a/sql/updates/world/master/2017_03_18_08_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_18_08_world.sql
diff --git a/sql/updates/world/master/2017_03_19_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_19_00_world.sql
index 8c6f96c395c..8c6f96c395c 100644
--- a/sql/updates/world/master/2017_03_19_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_19_00_world.sql
diff --git a/sql/updates/world/master/2017_03_21_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_21_00_world.sql
index 2917a06d027..2917a06d027 100644
--- a/sql/updates/world/master/2017_03_21_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_21_00_world.sql
diff --git a/sql/updates/world/master/2017_03_21_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_21_01_world.sql
index 4128164a127..4128164a127 100644
--- a/sql/updates/world/master/2017_03_21_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_21_01_world.sql
diff --git a/sql/updates/world/master/2017_03_21_02_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_21_02_world.sql
index 5430cc6a8b4..5430cc6a8b4 100644
--- a/sql/updates/world/master/2017_03_21_02_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_21_02_world.sql
diff --git a/sql/updates/world/master/2017_03_26_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_26_00_world.sql
index 2c25bc52a47..2c25bc52a47 100644
--- a/sql/updates/world/master/2017_03_26_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_26_00_world.sql
diff --git a/sql/updates/world/master/2017_03_26_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_26_01_world.sql
index b68b432fbfe..b68b432fbfe 100644
--- a/sql/updates/world/master/2017_03_26_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_26_01_world.sql
diff --git a/sql/updates/world/master/2017_03_26_02_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_26_02_world.sql
index 94515a90eda..94515a90eda 100644
--- a/sql/updates/world/master/2017_03_26_02_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_26_02_world.sql
diff --git a/sql/updates/world/master/2017_03_26_03_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_26_03_world.sql
index af0dec65138..af0dec65138 100644
--- a/sql/updates/world/master/2017_03_26_03_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_26_03_world.sql
diff --git a/sql/updates/world/master/2017_03_26_04_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_26_04_world.sql
index 739b987fde1..739b987fde1 100644
--- a/sql/updates/world/master/2017_03_26_04_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_26_04_world.sql
diff --git a/sql/updates/world/master/2017_03_26_05_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_26_05_world.sql
index de2886b8c09..de2886b8c09 100644
--- a/sql/updates/world/master/2017_03_26_05_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_26_05_world.sql
diff --git a/sql/updates/world/master/2017_03_27_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_27_00_world.sql
index 413fdf23b4c..413fdf23b4c 100644
--- a/sql/updates/world/master/2017_03_27_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_27_00_world.sql
diff --git a/sql/updates/world/master/2017_03_27_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_27_01_world.sql
index e1b658be657..e1b658be657 100644
--- a/sql/updates/world/master/2017_03_27_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_27_01_world.sql
diff --git a/sql/updates/world/master/2017_03_27_02_world.sql b/sql/old/7/world/00_2017_04_18/2017_03_27_02_world.sql
index 333bc9c5175..333bc9c5175 100644
--- a/sql/updates/world/master/2017_03_27_02_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_03_27_02_world.sql
diff --git a/sql/updates/world/master/2017_04_01_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_04_01_00_world.sql
index 33b85a3f393..33b85a3f393 100644
--- a/sql/updates/world/master/2017_04_01_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_04_01_00_world.sql
diff --git a/sql/updates/world/master/2017_04_02_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_04_02_00_world.sql
index 89bd3d4cd3c..89bd3d4cd3c 100644
--- a/sql/updates/world/master/2017_04_02_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_04_02_00_world.sql
diff --git a/sql/updates/world/master/2017_04_03_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_04_03_00_world.sql
index ad2bc15e251..ad2bc15e251 100644
--- a/sql/updates/world/master/2017_04_03_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_04_03_00_world.sql
diff --git a/sql/updates/world/master/2017_04_14_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_04_14_00_world.sql
index 636a9d33ebd..636a9d33ebd 100644
--- a/sql/updates/world/master/2017_04_14_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_04_14_00_world.sql
diff --git a/sql/updates/world/master/2017_04_15_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_04_15_00_world.sql
index 532822af4db..532822af4db 100644
--- a/sql/updates/world/master/2017_04_15_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_04_15_00_world.sql
diff --git a/sql/updates/world/master/2017_04_16_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_04_16_00_world.sql
index bfa61ed2a67..bfa61ed2a67 100644
--- a/sql/updates/world/master/2017_04_16_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_04_16_00_world.sql
diff --git a/sql/updates/world/master/2017_04_16_01_world.sql b/sql/old/7/world/00_2017_04_18/2017_04_16_01_world.sql
index e32307a6869..e32307a6869 100644
--- a/sql/updates/world/master/2017_04_16_01_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_04_16_01_world.sql
diff --git a/sql/updates/world/master/2017_04_16_02_world.sql b/sql/old/7/world/00_2017_04_18/2017_04_16_02_world.sql
index 149a3682095..149a3682095 100644
--- a/sql/updates/world/master/2017_04_16_02_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_04_16_02_world.sql
diff --git a/sql/updates/world/master/2017_04_16_03_world.sql b/sql/old/7/world/00_2017_04_18/2017_04_16_03_world.sql
index 19448f7f552..19448f7f552 100644
--- a/sql/updates/world/master/2017_04_16_03_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_04_16_03_world.sql
diff --git a/sql/updates/world/master/2017_04_16_04_world.sql b/sql/old/7/world/00_2017_04_18/2017_04_16_04_world.sql
index 8ea51242758..8ea51242758 100644
--- a/sql/updates/world/master/2017_04_16_04_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_04_16_04_world.sql
diff --git a/sql/updates/world/master/2017_04_16_05_world.sql b/sql/old/7/world/00_2017_04_18/2017_04_16_05_world.sql
index 02bd0e4d4ef..02bd0e4d4ef 100644
--- a/sql/updates/world/master/2017_04_16_05_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_04_16_05_world.sql
diff --git a/sql/updates/world/master/2017_04_16_06_world.sql b/sql/old/7/world/00_2017_04_18/2017_04_16_06_world.sql
index 972cd7f309a..972cd7f309a 100644
--- a/sql/updates/world/master/2017_04_16_06_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_04_16_06_world.sql
diff --git a/sql/updates/world/master/2017_04_17_00_world.sql b/sql/old/7/world/00_2017_04_18/2017_04_17_00_world.sql
index b0eb670375e..b0eb670375e 100644
--- a/sql/updates/world/master/2017_04_17_00_world.sql
+++ b/sql/old/7/world/00_2017_04_18/2017_04_17_00_world.sql
diff --git a/sql/updates/auth/master/2017_04_19_00_auth.sql b/sql/updates/auth/master/2017_04_19_00_auth.sql
new file mode 100644
index 00000000000..cc9e3b957a9
--- /dev/null
+++ b/sql/updates/auth/master/2017_04_19_00_auth.sql
@@ -0,0 +1,4 @@
+-- TDB 720.00 auth
+DELETE FROM `updates_include` WHERE `path`='$/sql/old/7/auth';
+INSERT INTO `updates_include` (`path`, `state`) VALUES ('$/sql/old/7/auth', 'ARCHIVED');
+UPDATE `updates` SET `state`='ARCHIVED';
diff --git a/sql/updates/characters/master/2017_04_19_00_characters.sql b/sql/updates/characters/master/2017_04_19_00_characters.sql
new file mode 100644
index 00000000000..cedbe3833eb
--- /dev/null
+++ b/sql/updates/characters/master/2017_04_19_00_characters.sql
@@ -0,0 +1,4 @@
+-- TDB 720.00 characters
+DELETE FROM `updates_include` WHERE `path`='$/sql/old/7/characters';
+INSERT INTO `updates_include` (`path`, `state`) VALUES ('$/sql/old/7/characters', 'ARCHIVED');
+UPDATE `updates` SET `state`='ARCHIVED';
diff --git a/sql/updates/hotfixes/master/2017_04_19_00_hotfixes.sql b/sql/updates/hotfixes/master/2017_04_19_00_hotfixes.sql
new file mode 100644
index 00000000000..2fce5d4bae0
--- /dev/null
+++ b/sql/updates/hotfixes/master/2017_04_19_00_hotfixes.sql
@@ -0,0 +1,4 @@
+-- TDB 720.00 hotfixes
+DELETE FROM `updates_include` WHERE `path`='$/sql/old/7/hotfixes';
+INSERT INTO `updates_include` (`path`, `state`) VALUES ('$/sql/old/7/hotfixes', 'ARCHIVED');
+UPDATE `updates` SET `state`='ARCHIVED';
diff --git a/sql/updates/world/master/2017_04_19_00_world.sql b/sql/updates/world/master/2017_04_19_00_world.sql
new file mode 100644
index 00000000000..8765f060277
--- /dev/null
+++ b/sql/updates/world/master/2017_04_19_00_world.sql
@@ -0,0 +1,5 @@
+-- TDB 720.00 world
+DELETE FROM `updates_include` WHERE `path`='$/sql/old/7/world';
+INSERT INTO `updates_include` (`path`, `state`) VALUES ('$/sql/old/7/world', 'ARCHIVED');
+UPDATE `updates` SET `state`='ARCHIVED';
+UPDATE `version` SET `db_version`='TDB 720.00', `cache_id`=6 LIMIT 1;