diff --git a/sql/updates/world/4.3.4/2023_09_12_01_world.sql b/sql/updates/world/4.3.4/2023_09_12_01_world.sql
new file mode 100644
index 0000000000..3ba35b3dd5
--- /dev/null
+++ b/sql/updates/world/4.3.4/2023_09_12_01_world.sql
@@ -0,0 +1,58 @@
+DELETE FROM `areatrigger_scripts` WHERE `entry` IN (5542, 5543, 5544, 5545, 5546, 5547, 5548, 5549, 5550, 5551, 5552, 5553, 5554, 5567, 5568, 5574, 5575, 5576, 5577);
+
+INSERT INTO `areatrigger_scripts` (`entry`, `ScriptName`) VALUES
+(5542, 'at_gasping_for_breath'),
+(5543, 'at_gasping_for_breath'),
+(5544, 'at_gasping_for_breath'),
+(5545, 'at_gasping_for_breath'),
+(5546, 'at_gasping_for_breath'),
+(5547, 'at_gasping_for_breath'),
+(5548, 'at_gasping_for_breath'),
+(5549, 'at_gasping_for_breath'),
+(5550, 'at_gasping_for_breath'),
+(5551, 'at_gasping_for_breath'),
+(5552, 'at_gasping_for_breath'),
+(5553, 'at_gasping_for_breath'),
+(5554, 'at_gasping_for_breath'),
+(5567, 'at_gasping_for_breath'),
+(5568, 'at_gasping_for_breath'),
+(5574, 'at_gasping_for_breath'),
+(5575, 'at_gasping_for_breath'),
+(5576, 'at_gasping_for_breath'),
+(5577, 'at_gasping_for_breath');
+
+DELETE FROM `spell_script_names` WHERE `spell_id`=68737;
+DELETE FROM `spell_script_names` WHERE `spell_id`=68741;
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(68737, 'spell_gilneas_save_drowning_milita_effect'),
+(68741, 'spell_gilneas_drowning_vehicle_exit_dummy');
+
+UPDATE `creature_text` SET `BroadcastTextId`='36418' WHERE  `CreatureID`=36440 AND `GroupID`=0 AND `ID`=0;
+UPDATE `creature_text` SET `GroupID`='0', `ID`='1', `BroadcastTextId`='36417' WHERE  `CreatureID`=36440 AND `GroupID`=1 AND `ID`=0;
+UPDATE `creature_text` SET `GroupID`='0', `ID`='3', `BroadcastTextId`='36419' WHERE  `CreatureID`=36440 AND `GroupID`=2 AND `ID`=0;
+
+UPDATE `creature` SET `terrainSwapMap`='655' WHERE  `guid` IN (255797, 255810, 255819, 255821, 255823, 255825, 255833, 255837, 255843, 255844, 255853);
+
+DELETE FROM `npc_spellclick_spells` WHERE `npc_entry` = 36440;
+INSERT INTO `npc_spellclick_spells` (`npc_entry`, `spell_id`, `cast_flags`, `user_type`) VALUES
+(36440, 68735, 1, 0);
+DELETE FROM `conditions` WHERE (`SourceTypeOrReferenceId` = 18) AND (`SourceGroup` IN (36440));
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `Comment`) VALUES 
+(18, 36440, 68735, 0, 0, 9, 0, 14395, 0, 0, 0, 'Clicker has quest Gasping for Breath (14395) active'),
+(18, 36440, 68735, 0, 0, 28, 0, 14395, 0, 0, 1, 'Clicker hasn\'t completed quest Gasping for Breath (14395) (or completed and rewarded)');
+
+ -- Drowning Watchman smart ai
+SET @ENTRY := 36440;
+DELETE FROM `smart_scripts` WHERE `source_type` = 0 AND `entryOrGuid` = @ENTRY;
+UPDATE `creature_template` SET `AIName` = 'SmartAI', `ScriptName` = '' 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, 1, 73, 0, 100, 0, 0, 0, 0, 0, 11, 47020, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'On spellclick - Self: Cast spell  Ride Vehicle (47020) on Clicker'),
+(@ENTRY, 0, 1, 2, 61, 0, 100, 0, 0, 0, 0, 0, 83, 16777216, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'On spellclick - Self: Remove npc flags SPELLCLICK'),
+(@ENTRY, 0, 2, 0, 61, 0, 100, 0, 0, 0, 0, 0, 28, 68730, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'On spellclick - Self: Remove aura due to spell  Drowning (68730)'),
+(@ENTRY, 0, 3, 4, 8, 0, 100, 1, 68739, 0, 0, 0, 41, 10000, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'On spell  Drowning Militia Dummy (68739) hit - Self: Despawn in 10 s'),
+(@ENTRY, 0, 4, 5, 61, 0, 100, 0, 0, 0, 0, 0, 67, 1, 1500, 1500, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'On spell  Drowning Militia Dummy (68739) hit - Trigger timed event timedEvent[1] in 1500 - 1500 ms'),
+(@ENTRY, 0, 5, 0, 61, 0, 100, 0, 0, 0, 0, 0, 67, 2, 3000, 3000, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 'On spell  Drowning Militia Dummy (68739) hit - Trigger timed event timedEvent[2] in 3000 - 3000 ms'),
+(@ENTRY, 0, 6, 0, 59, 0, 30, 0, 1, 0, 0, 0, 90, 8, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'On timed event timedEvent[1] triggered - Self: Set stand state to KNEEL'),
+(@ENTRY, 0, 7, 0, 59, 0, 100, 0, 2, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'On timed event timedEvent[2] triggered - Self: Talk I... I thought I was a goner.  Thanks. (0) to invoker');
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 22 AND `SourceEntry` = 36440 AND `SourceId` = 0;
diff --git a/src/server/scripts/EasternKingdoms/Gilneas/gilneas_chapter_2.cpp b/src/server/scripts/EasternKingdoms/Gilneas/gilneas_chapter_2.cpp
index d6c0731739..53bcdc4f04 100644
--- a/src/server/scripts/EasternKingdoms/Gilneas/gilneas_chapter_2.cpp
+++ b/src/server/scripts/EasternKingdoms/Gilneas/gilneas_chapter_2.cpp
@@ -625,6 +625,77 @@ class spell_gilneas_worgen_intro_completion : public SpellScript
     }
 };
 
+enum GaspingForBreath
+{
+    NPC_DROWNING_WATCHMAN_CREDIT        = 36450,
+
+    SPELL_RESCUE_DROWNING_WATCHMAN      = 68735,
+    SPELL_SAVE_DROWNING_MILITA_EFFECT   = 68737,
+    SPELL_DROWNING_MILITA_DUMMY         = 68739,
+    SPELL_DROWNING_VEHICLE_EXIT_DUMMY   = 68741
+
+};
+
+// 68737 Save Drowning Militia Effect
+class spell_gilneas_save_drowning_milita_effect : public SpellScript
+{
+    void HandleScript(SpellEffIndex effIndex)
+    {
+        PreventHitDefaultEffect(effIndex);
+
+        if (Player* player = GetHitPlayer())
+            player->KilledMonsterCredit(NPC_DROWNING_WATCHMAN_CREDIT);
+    }
+
+    void Register() override
+    {
+        OnEffectHitTarget.Register(&spell_gilneas_save_drowning_milita_effect::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
+    }
+};
+
+// 68737 Drowning Vehicle Exit Dummy
+class spell_gilneas_drowning_vehicle_exit_dummy : public SpellScript
+{
+    void HandleScript(SpellEffIndex effIndex)
+    {
+        PreventHitDefaultEffect(effIndex);
+
+        if (Player* player = GetHitPlayer())
+            player->RemoveAurasDueToSpell(SPELL_RESCUE_DROWNING_WATCHMAN);
+    }
+
+    void HandleHit(SpellEffIndex /*effIndex*/)
+    {
+        if (Unit* unit = GetHitUnit())
+            unit->ExitVehicle();
+    }
+
+    void Register() override
+    {
+        OnEffectHitTarget.Register(&spell_gilneas_drowning_vehicle_exit_dummy::HandleScript, EFFECT_0, SPELL_EFFECT_SCRIPT_EFFECT);
+        OnEffectHitTarget.Register(&spell_gilneas_drowning_vehicle_exit_dummy::HandleHit, EFFECT_0, SPELL_EFFECT_DUMMY);
+    }
+};
+
+class at_gasping_for_breath : public AreaTriggerScript
+{
+public:
+    at_gasping_for_breath() : AreaTriggerScript("at_gasping_for_breath") { }
+
+    bool OnTrigger(Player* player, AreaTriggerEntry const* /*areaTrigger*/) override
+    {
+        if (Vehicle* vehicle = player->GetVehicleKit())
+            if (Unit* passenger = vehicle->GetPassenger(SEAT_0))
+            {
+                player->CastSpell(passenger, SPELL_DROWNING_MILITA_DUMMY);
+                player->CastSpell(passenger, SPELL_DROWNING_VEHICLE_EXIT_DUMMY);
+                player->CastSpell(nullptr, SPELL_SAVE_DROWNING_MILITA_EFFECT);
+            }
+
+        return true;
+    }
+};
+
 void AddSC_gilneas_chapter_2()
 {
     RegisterGameObjectAI(go_gilneas_invasion_camera);
@@ -637,4 +708,7 @@ void AddSC_gilneas_chapter_2()
     RegisterSpellScript(spell_gilneas_call_attack_mastiff);
     RegisterSpellScript(spell_gilneas_forcecast_cataclysm_1);
     RegisterSpellScript(spell_gilneas_worgen_intro_completion);
+    RegisterSpellScript(spell_gilneas_save_drowning_milita_effect);
+    RegisterSpellScript(spell_gilneas_drowning_vehicle_exit_dummy);
+    new at_gasping_for_breath();
 }