diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index db7c127df..584089651 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -3,9 +3,7 @@ name: Bug report
 about: Create a report to help us improve
 title: "[Bug] - esx_script - Issue"
 labels: bug
-assignees:
-  - TheFantomas
-  - Gellipapa
+assignees: Arctos2win, Kenshiin13
 
 ---
 
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index bc4eaabaf..305b3f1b6 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -3,9 +3,7 @@ name: Feature Request
 about: Help us improve esx with your ideas
 title: "[Feature Request] - esx_script - Add better configuration"
 labels: enhancement
-assignees:
-  - TheFantomas
-  - Gellipapa
+assignees: Arctos2win, Kenshiin13
 
 ---
 
diff --git a/[core]/cron/fxmanifest.lua b/[core]/cron/fxmanifest.lua
index db502695f..fef53dc8a 100644
--- a/[core]/cron/fxmanifest.lua
+++ b/[core]/cron/fxmanifest.lua
@@ -4,6 +4,6 @@ game 'gta5'
 author 'ESX-Framework'
 description 'Allows resources to Run tasks at specific intervals.'
 lua54 'yes'
-version '1.12.3'
+version '1.12.4'
 
 server_script 'server/main.lua'
diff --git a/[core]/es_extended/client/modules/actions.lua b/[core]/es_extended/client/modules/actions.lua
index 98b864b1d..6e8775380 100644
--- a/[core]/es_extended/client/modules/actions.lua
+++ b/[core]/es_extended/client/modules/actions.lua
@@ -190,6 +190,26 @@ function Actions:TrackWeapon()
     end
 end
 
+function Actions:TrackJumping()
+    local isJumping = IsPedJumping(ESX.PlayerData.ped)
+    
+    if isJumping and not self.isJumping then
+        self.isJumping = true
+        TriggerEvent("esx:playerJumping")
+        TriggerServerEvent("esx:playerJumping")
+        
+        if Config.EnableDebug then
+            print("[DEBUG] Player started jumping")
+        end
+    elseif not isJumping and self.isJumping then
+        self.isJumping = false
+        
+        if Config.EnableDebug then
+            print("[DEBUG] Player stopped jumping")
+        end
+    end
+end
+
 function Actions:SlowLoop()
     CreateThread(function()
         while ESX.PlayerLoaded do
@@ -197,6 +217,7 @@ function Actions:SlowLoop()
             self:TrackPauseMenu()
             self:TrackVehicle()
             self:TrackWeapon()
+            self:TrackJumping()
             Wait(500)
         end
     end)
diff --git a/[core]/es_extended/client/modules/death.lua b/[core]/es_extended/client/modules/death.lua
index ba3fb846d..346c3ce42 100644
--- a/[core]/es_extended/client/modules/death.lua
+++ b/[core]/es_extended/client/modules/death.lua
@@ -62,6 +62,8 @@ end
 
 AddEventHandler("esx:onPlayerSpawn", function()
     Citizen.CreateThreadNow(function()
+        while not ESX.PlayerLoaded do Wait(0) end
+
         while ESX.PlayerLoaded and not ESX.PlayerData.dead do
             if DoesEntityExist(ESX.PlayerData.ped) and (IsPedDeadOrDying(ESX.PlayerData.ped, true) or IsPedFatallyInjured(ESX.PlayerData.ped)) then
                 Death:Died()
diff --git a/[core]/es_extended/fxmanifest.lua b/[core]/es_extended/fxmanifest.lua
index a579d4eed..28140c36c 100644
--- a/[core]/es_extended/fxmanifest.lua
+++ b/[core]/es_extended/fxmanifest.lua
@@ -3,7 +3,7 @@ fx_version 'cerulean'
 game 'gta5'
 description 'The Core resource that provides the functionalities for all other resources.'
 lua54 'yes'
-version '1.12.3'
+version '1.12.4'
 
 shared_scripts {
 	'locale.lua',
diff --git a/[core]/esx_chat_theme/fxmanifest.lua b/[core]/esx_chat_theme/fxmanifest.lua
index 704c76b3b..a907d6cb4 100644
--- a/[core]/esx_chat_theme/fxmanifest.lua
+++ b/[core]/esx_chat_theme/fxmanifest.lua
@@ -1,4 +1,4 @@
-version '1.12.3'
+version '1.12.4'
 author 'ESX-Framework'
 description 'A ESX Stylised theme for the chat resource.'
 
diff --git a/[core]/esx_context/fxmanifest.lua b/[core]/esx_context/fxmanifest.lua
index 4be9c6188..b7ddfaa7f 100644
--- a/[core]/esx_context/fxmanifest.lua
+++ b/[core]/esx_context/fxmanifest.lua
@@ -4,7 +4,7 @@ game 'gta5'
 author 'ESX-Framework & Brayden'
 description 'A simplistic context menu for ESX.'
 lua54 'yes'
-version '1.12.3'
+version '1.12.4'
 
 ui_page 'index.html'
 
diff --git a/[core]/esx_identity/fxmanifest.lua b/[core]/esx_identity/fxmanifest.lua
index 1ff5e2dec..bc380fc8d 100644
--- a/[core]/esx_identity/fxmanifest.lua
+++ b/[core]/esx_identity/fxmanifest.lua
@@ -3,7 +3,7 @@ fx_version 'adamant'
 game 'gta5'
 description 'Allows the player to Pick their characters: Name, Gender, Height and Date-of-birth.'
 lua54 'yes'
-version '1.12.3'
+version '1.12.4'
 
 shared_scripts {
 	'@es_extended/imports.lua',
diff --git a/[core]/esx_loadingscreen/fxmanifest.lua b/[core]/esx_loadingscreen/fxmanifest.lua
index 9c5eba200..72130911b 100644
--- a/[core]/esx_loadingscreen/fxmanifest.lua
+++ b/[core]/esx_loadingscreen/fxmanifest.lua
@@ -3,7 +3,7 @@ game 'common'
 fx_version 'cerulean'
 author 'ESX-Framework'
 description 'Allows resources to Run tasks at specific intervals.'
-version '1.12.3'
+version '1.12.4'
 lua54 'yes'
 
 loadscreen 'index.html'
diff --git a/[core]/esx_menu_default/fxmanifest.lua b/[core]/esx_menu_default/fxmanifest.lua
index fc1719983..2dc064e6f 100644
--- a/[core]/esx_menu_default/fxmanifest.lua
+++ b/[core]/esx_menu_default/fxmanifest.lua
@@ -3,7 +3,7 @@ fx_version 'adamant'
 game 'gta5'
 description 'A basic menu system for ESX Legacy.'
 lua54 'yes'
-version '1.12.3'
+version '1.12.4'
 
 client_scripts { '@es_extended/imports.lua', 'client/main.lua' }
 
diff --git a/[core]/esx_menu_dialog/fxmanifest.lua b/[core]/esx_menu_dialog/fxmanifest.lua
index 093505750..a1d41f8ee 100644
--- a/[core]/esx_menu_dialog/fxmanifest.lua
+++ b/[core]/esx_menu_dialog/fxmanifest.lua
@@ -3,7 +3,7 @@ fx_version 'adamant'
 game 'gta5'
 description 'A basic input dialog for ESX Legacy.'
 lua54 'yes'
-version '1.12.3'
+version '1.12.4'
 
 client_scripts {
 	'@es_extended/imports.lua',
diff --git a/[core]/esx_menu_list/fxmanifest.lua b/[core]/esx_menu_list/fxmanifest.lua
index f0f4b534d..ddb7b53f6 100644
--- a/[core]/esx_menu_list/fxmanifest.lua
+++ b/[core]/esx_menu_list/fxmanifest.lua
@@ -3,7 +3,7 @@ fx_version 'adamant'
 game 'gta5'
 description 'A basic table-based menu system for ESX Legacy.'
 lua54 'yes'
-version '1.12.3'
+version '1.12.4'
 
 
 client_scripts {
diff --git a/[core]/esx_multicharacter/fxmanifest.lua b/[core]/esx_multicharacter/fxmanifest.lua
index 670945b92..3f0e7c092 100644
--- a/[core]/esx_multicharacter/fxmanifest.lua
+++ b/[core]/esx_multicharacter/fxmanifest.lua
@@ -3,7 +3,7 @@ fx_version 'cerulean'
 game 'gta5'
 author 'ESX-Framework - Linden - KASH'
 description 'Allows players to have multiple characters on the same account.'
-version '1.12.3'
+version '1.12.4'
 lua54 'yes'
 
 dependencies { 'es_extended', 'esx_context', 'esx_identity', 'esx_skin' }
diff --git a/[core]/esx_notify/fxmanifest.lua b/[core]/esx_notify/fxmanifest.lua
index dd5546813..a7e1b45d8 100644
--- a/[core]/esx_notify/fxmanifest.lua
+++ b/[core]/esx_notify/fxmanifest.lua
@@ -2,7 +2,7 @@ fx_version 'adamant'
 
 lua54 'yes'
 game 'gta5'
-version '1.12.3'
+version '1.12.4'
 author 'ESX-Framework'
 description 'A beautiful and simple NUI notification system for ESX'
 
diff --git a/[core]/esx_progressbar/fxmanifest.lua b/[core]/esx_progressbar/fxmanifest.lua
index 2180b57fd..d4a43ac31 100644
--- a/[core]/esx_progressbar/fxmanifest.lua
+++ b/[core]/esx_progressbar/fxmanifest.lua
@@ -3,7 +3,7 @@ fx_version 'adamant'
 game 'gta5'
 author 'ESX-Framework'
 description 'A beautiful and simple NUI progress bar for ESX'
-version '1.12.3'
+version '1.12.4'
 lua54 'yes'
 
 client_scripts { 'Progress.lua' }
diff --git a/[core]/esx_skin/fxmanifest.lua b/[core]/esx_skin/fxmanifest.lua
index 25569210b..2ff7a3688 100644
--- a/[core]/esx_skin/fxmanifest.lua
+++ b/[core]/esx_skin/fxmanifest.lua
@@ -2,7 +2,7 @@ fx_version 'adamant'
 
 game 'gta5'
 description 'Allows players to customise their character\'s appearance'
-version '1.12.3'
+version '1.12.4'
 lua54 'yes'
 
 shared_scripts {
diff --git a/[core]/esx_textui/fxmanifest.lua b/[core]/esx_textui/fxmanifest.lua
index 0fdd56050..69effe80c 100644
--- a/[core]/esx_textui/fxmanifest.lua
+++ b/[core]/esx_textui/fxmanifest.lua
@@ -3,7 +3,7 @@ fx_version 'adamant'
 game 'gta5'
 author 'ESX-Framework'
 description 'A beautiful and simple Persistent Notification system for ESX.'
-version '1.12.3'
+version '1.12.4'
 lua54 'yes'
 
 client_scripts { 'TextUI.lua' }
diff --git a/[core]/skinchanger/fxmanifest.lua b/[core]/skinchanger/fxmanifest.lua
index 288bd7513..d3ea6cb34 100644
--- a/[core]/skinchanger/fxmanifest.lua
+++ b/[core]/skinchanger/fxmanifest.lua
@@ -2,7 +2,7 @@ fx_version 'adamant'
 
 game 'gta5'
 description 'Saves/loads character appearances for ESX Legacy.'
-version '1.12.3'
+version '1.12.4'
 lua54 'yes'
 
 client_scripts {