diff --git a/data/sql/updates/db_world/2018_09_24_00.sql b/data/sql/updates/db_world/2018_09_24_00.sql
new file mode 100644
index 000000000..11bbd58f2
--- /dev/null
+++ b/data/sql/updates/db_world/2018_09_24_00.sql
@@ -0,0 +1,40 @@
+-- DB update 2018_08_26_00 -> 2018_09_24_00
+DROP PROCEDURE IF EXISTS `updateDb`;
+DELIMITER //
+CREATE PROCEDURE updateDb ()
+proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT 'FALSE';
+SELECT COUNT(*) INTO @COLEXISTS
+FROM information_schema.COLUMNS
+WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'version_db_world' AND COLUMN_NAME = '2018_08_26_00';
+IF @COLEXISTS = 0 THEN LEAVE proc; END IF;
+START TRANSACTION;
+ALTER TABLE version_db_world CHANGE COLUMN 2018_08_26_00 2018_09_24_00 bit;
+SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1537701976962508800'; IF OK <> 'FALSE' THEN LEAVE proc; END IF;
+--
+-- START UPDATING QUERIES
+--
+
+INSERT INTO version_db_world (`sql_rev`) VALUES ('1537701976962508800');
+SET @ENTRY := 7726;
+DELETE FROM smart_scripts WHERE entryOrGuid = 7726 AND source_type = 0;
+UPDATE creature_template SET AIName="SmartAI" WHERE entry= @ENTRY;
+INSERT INTO smart_scripts (entryorguid, source_type, id, link, event_type, event_phase_mask, event_chance, event_flags, event_param1, event_param2, event_param3, event_param4, action_type, action_param1, action_param2, action_param3, action_param4, action_param5, action_param6, target_type, target_param1, target_param2, target_param3, target_x, target_y, target_z, target_o, comment) VALUES
+(@ENTRY, 0, 0, 0, 4, 0, 100, 1, 0, 0, 0, 0, 22, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "On aggro - Self: Set event phase to 1"),
+(@ENTRY, 0, 1, 0, 0, 1, 100, 0, 0, 0, 3400, 4700, 11, 9739, 64, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, "Every 3.4 - 4.7 seconds (0 - 0s initially) [IC] - Self: Cast spell 9739 on Victim"),
+(@ENTRY, 0, 2, 0, 2, 0, 100, 1, 0, 50, 0, 0, 22, 2, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "When health between 0 and 50 (check every 0 - 0 ms) - Self: Set event phase to 2"),
+(@ENTRY, 0, 3, 0, 0, 2, 100, 1, 0, 0, 0, 0, 11, 19030, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Once [IC] - Self: Cast spell 19030 on Self"),
+(@ENTRY, 0, 4, 0, 0, 2, 100, 0, 5000, 7000, 11000, 13000, 11, 12161, 2, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, "Every 11 - 13 seconds (5 - 7s initially) [IC] - Self: Cast spell 12161 on Victim"),
+(@ENTRY, 0, 5, 0, 0, 2, 100, 0, 8000, 10000, 24000, 28000, 11, 15727, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Every 24 - 28 seconds (8 - 10s initially) [IC] - Self: Cast spell 15727 on Self"),
+(@ENTRY, 0, 6, 0, 0, 2, 100, 1, 0, 0, 0, 0, 21, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Once [IC] - Self: Enable combat based movement"),
+(@ENTRY, 0, 7, 0, 2, 0, 100, 1, 0, 15, 0, 0, 25, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "When health between 0 and 15 (check every 0 - 0 ms) - Self: Flee for assist"),
+(@ENTRY, 0, 8, 0, 25, 0, 100, 0, 0, 0, 0, 0, 28, 19030, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "On reset (e.g. after reaching home) - Self: Remove aura due to spell 19030"),
+(@ENTRY, 0, 9, 0, 25, 0, 100, 0, 0, 0, 0, 0, 3, 7726, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "On reset (e.g. after reaching home) - Self: Morph to model from creature Grimtotem Naturalist");
+
+--
+-- END UPDATING QUERIES
+--
+COMMIT;
+END //
+DELIMITER ;
+CALL updateDb();
+DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/data/sql/updates/db_world/2018_09_26_00.sql b/data/sql/updates/db_world/2018_09_26_00.sql
new file mode 100644
index 000000000..588f479aa
--- /dev/null
+++ b/data/sql/updates/db_world/2018_09_26_00.sql
@@ -0,0 +1,33 @@
+-- DB update 2018_09_24_00 -> 2018_09_26_00
+DROP PROCEDURE IF EXISTS `updateDb`;
+DELIMITER //
+CREATE PROCEDURE updateDb ()
+proc:BEGIN DECLARE OK VARCHAR(100) DEFAULT 'FALSE';
+SELECT COUNT(*) INTO @COLEXISTS
+FROM information_schema.COLUMNS
+WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = 'version_db_world' AND COLUMN_NAME = '2018_09_24_00';
+IF @COLEXISTS = 0 THEN LEAVE proc; END IF;
+START TRANSACTION;
+ALTER TABLE version_db_world CHANGE COLUMN 2018_09_24_00 2018_09_26_00 bit;
+SELECT sql_rev INTO OK FROM version_db_world WHERE sql_rev = '1537776455769123600'; IF OK <> 'FALSE' THEN LEAVE proc; END IF;
+--
+-- START UPDATING QUERIES
+--
+
+INSERT INTO version_db_world (`sql_rev`) VALUES ('1537776455769123600');
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=6658 AND `SourceEntry`=7917 AND `SourceId`=0 AND `ElseGroup`=0 AND `ConditionTypeOrReference`=8 AND `ConditionTarget`=0 AND `ConditionValue1`=8599 AND `ConditionValue2`=0 AND `ConditionValue3`=0;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES (14, 6658, 7917, 0, 0, 8, 0, 8599, 0, 0, 1, 0, 0, '', 'Show text if player doesn\'t have quest rewarded');
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=14 AND `SourceGroup`=6658 AND `SourceEntry`=7916 AND `SourceId`=0 AND `ElseGroup`=0 AND `ConditionTypeOrReference`=8 AND `ConditionTarget`=0 AND `ConditionValue1`=8599 AND `ConditionValue2`=0 AND `ConditionValue3`=0;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES (14, 6658, 7916, 0, 0, 8, 0, 8599, 0, 0, 0, 0, 0, '', 'Show text if player has quest rewarded');
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=6658 AND `SourceEntry`=0 AND `SourceId`=0 AND `ElseGroup`=0 AND `ConditionTypeOrReference`=8 AND `ConditionTarget`=0 AND `ConditionValue1`=8599 AND `ConditionValue2`=0 AND `ConditionValue3`=0;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES (15, 6658, 0, 0, 0, 8, 0, 8599, 0, 0, 0, 0, 0, '', 'Show gossip only if player has quest done');
+
+
+--
+-- END UPDATING QUERIES
+--
+COMMIT;
+END //
+DELIMITER ;
+CALL updateDb();
+DROP PROCEDURE IF EXISTS `updateDb`;
diff --git a/src/server/authserver/authserver.conf.dist b/src/server/authserver/authserver.conf.dist
index 4d8c463aa..fba05578c 100644
--- a/src/server/authserver/authserver.conf.dist
+++ b/src/server/authserver/authserver.conf.dist
@@ -181,8 +181,11 @@ DBLogLevel = 1
 #
 #    UseProcessors
 #        Description: Processors mask for Windows and Linux based multi-processor systems.
-#        Example:     A computer with 2 CPUs:
-#                     1 - 1st CPU only, 2 - 2nd CPU only, 3 - 1st and 2nd CPU, because 1 | 2 is 3
+#        Example:  For a computer with 3 CPUs:
+#                     1 - 1st CPU only
+#                     2 - 2nd CPU only
+#                     4 - 3rd CPU only
+#                     6 - 2nd + 3rd CPUs, because "2 | 4" -> 6
 #        Default:     0  - (Selected by OS)
 #                     1+ - (Bit mask value of selected processors)
 
diff --git a/src/server/worldserver/worldserver.conf.dist b/src/server/worldserver/worldserver.conf.dist
index af1ecce02..54d8cf0cd 100644
--- a/src/server/worldserver/worldserver.conf.dist
+++ b/src/server/worldserver/worldserver.conf.dist
@@ -147,7 +147,12 @@ BindIP = "0.0.0.0"
 # PERFORMANCE SETTINGS
 #
 #    UseProcessors
-#        Description: Processors mask for Windows based multi-processor systems.
+#        Description: Processors mask for Windows and Linux based multi-processor systems.
+#        Example:  For a computer with 3 CPUs:
+#                     1 - 1st CPU only
+#                     2 - 2nd CPU only
+#                     4 - 3rd CPU only
+#                     6 - 2nd + 3rd CPUs, because "2 | 4" -> 6
 #        Default:     0  - (Selected by OS)
 #                     1+ - (Bit mask value of selected processors)
 
@@ -1453,7 +1458,7 @@ BirthdayTime = 1222964635
 #
 #   IsContinentTransport.Enabled
 #        Description: Controls the continent transport (ships, zeppelins etc..)
-#        Default:     1 - (Enabled) 
+#        Default:     1 - (Enabled)
 #
 #
 
@@ -1461,11 +1466,11 @@ IsContinentTransport.Enabled = 1
 
 #
 #   IsPreloadedContinentTransport.Enabled
-#        Description: Should we preload the transport? 
+#        Description: Should we preload the transport?
 #           (Not recommended on low-end servers as it consumes 100% more ram)
 #           and it's not really necessary to be enabled.
 #
-#        Default:     0 - (Disabled) 
+#        Default:     0 - (Disabled)
 #
 #
 
@@ -3127,7 +3132,7 @@ EnableLoginAfterDC = 1
 
 #
 #     DontCacheRandomMovementPaths
-#        Description: Random movement paths (calculated using MoveMaps) can be cached to save cpu time, 
+#        Description: Random movement paths (calculated using MoveMaps) can be cached to save cpu time,
 #                     but this may use up considerable amount of memory and can be prevented by setting this option to 1.
 #                     Recommended setting for populated servers is having enough RAM and setting this to 0.
 #        Default:     0 - (cache paths, uses more memory)
@@ -3145,7 +3150,7 @@ MoveMaps.Enable = 1
 
 #
 #     Minigob.Manabonk.Enable
-#        Description: Enable/ Disable Minigob Manabonk 
+#        Description: Enable/ Disable Minigob Manabonk
 #        Default:     1
 
 Minigob.Manabonk.Enable = 1