diff --git a/boot.lua b/boot.lua
index 29e5111a7..dc3d9040d 100644
--- a/boot.lua
+++ b/boot.lua
@@ -10,8 +10,8 @@
 		local addonName, Details222 = ...
 		local version, build, date, tocversion = GetBuildInfo()
 
-		_detalhes.build_counter = 10729
-		_detalhes.alpha_build_counter = 10729 --if this is higher than the regular counter, use it instead
+		_detalhes.build_counter = 10730
+		_detalhes.alpha_build_counter = 10730 --if this is higher than the regular counter, use it instead
 		_detalhes.dont_open_news = true
 		_detalhes.game_version = version
 		_detalhes.userversion = version .. " " .. _detalhes.build_counter
diff --git a/core/parser.lua b/core/parser.lua
index d8b18e782..445540d03 100755
--- a/core/parser.lua
+++ b/core/parser.lua
@@ -322,30 +322,6 @@
 			[45284] = 188196, --shaman lightining bolt overloaded
 
 			[228361] = 228360, --shadow priest void erruption
-
-			--ring powers merged, https://gist.github.com/ljosberinn/65abe150133ff3a08cd70f840f7dd019 (by Gerrit Alex - WCL)
-			--[=[]]
-			[403225] = 404884, -- Flame Licked Stone
-			[404974] = 404884, -- Shining Obsidian Stone
-			[405220] = 404884, -- Pestilent Plague Stone
-			[405221] = 404884, -- Pestilent Plague Stone
-			[405209] = 404884, -- Humming Arcane Stone
-			[403391] = 404884, -- Freezing Ice Stone
-			[404911] = 404884, -- Desirous Blood Stone
-			[404941] = 404884, -- Shining Obsidian Stone
-			[403087] = 404884, -- Storm Infused Stone
-			[403273] = 404884, -- Fel Flame via Entropic Fel Stone
-			[403171] = 404884, -- Uncontainable Charge via Echoing Thunder Stone
-			[405235] = 404884, -- Wild Spirit Stone
-			[403381] = 404884, -- Deluging Water Stone
-			[405118] = 404884, -- Exuding Steam Stone
-			[403408] = 404884, -- Exuding Steam Stone
-			[403336] = 404884, -- Indomitable Earth Stone
-			[403392] = 404884, -- Cold Frost Stone
-			[403376] = 404884, -- Gleaming Iron Stone
-			[403253] = 404884, -- Raging Magma Stone
-			[403257] = 404884, -- Searing Smokey Stone
-			--]=]
 		}
 	end
 
@@ -6013,6 +5989,51 @@ local SPELL_POWER_PAIN = SPELL_POWER_PAIN or (PowerEnum and PowerEnum.Pain) or 1
 
 		cacheAnything.track_hunter_frenzy = Details.combat_log.track_hunter_frenzy
 
+		if (Details.combat_log.merge_gemstones_1007) then
+			--ring powers merged, https://gist.github.com/ljosberinn/65abe150133ff3a08cd70f840f7dd019 (by Gerrit Alex - WCL)
+			override_spellId[403225] = 404884 --Flame Licked Stone
+			override_spellId[404974] = 404884 --Shining Obsidian Stone
+			override_spellId[405220] = 404884 --Pestilent Plague Stone
+			override_spellId[405221] = 404884 --Pestilent Plague Stone
+			override_spellId[405209] = 404884 --Humming Arcane Stone
+			override_spellId[403391] = 404884 --Freezing Ice Stone
+			override_spellId[404911] = 404884 --Desirous Blood Stone
+			override_spellId[404941] = 404884 --Shining Obsidian Stone
+			override_spellId[403087] = 404884 --Storm Infused Stone
+			override_spellId[403273] = 404884 --Fel Flame via Entropic Fel Stone
+			override_spellId[403171] = 404884 --Uncontainable Charge via Echoing Thunder Stone
+			override_spellId[405235] = 404884 --Wild Spirit Stone
+			override_spellId[403381] = 404884 --Deluging Water Stone
+			override_spellId[405118] = 404884 --Exuding Steam Stone
+			override_spellId[403408] = 404884 --Exuding Steam Stone
+			override_spellId[403336] = 404884 --Indomitable Earth Stone
+			override_spellId[403392] = 404884 --Cold Frost Stone
+			override_spellId[403376] = 404884 --Gleaming Iron Stone
+			override_spellId[403253] = 404884 --Raging Magma Stone
+			override_spellId[403257] = 404884 --Searing Smokey Stone
+		else
+			override_spellId[403225] = nil --Flame Licked Stone
+			override_spellId[404974] = nil --Shining Obsidian Stone
+			override_spellId[405220] = nil --Pestilent Plague Stone
+			override_spellId[405221] = nil --Pestilent Plague Stone
+			override_spellId[405209] = nil --Humming Arcane Stone
+			override_spellId[403391] = nil --Freezing Ice Stone
+			override_spellId[404911] = nil --Desirous Blood Stone
+			override_spellId[404941] = nil --Shining Obsidian Stone
+			override_spellId[403087] = nil --Storm Infused Stone
+			override_spellId[403273] = nil --Fel Flame via Entropic Fel Stone
+			override_spellId[403171] = nil --Uncontainable Charge via Echoing Thunder Stone
+			override_spellId[405235] = nil --Wild Spirit Stone
+			override_spellId[403381] = nil --Deluging Water Stone
+			override_spellId[405118] = nil --Exuding Steam Stone
+			override_spellId[403408] = nil --Exuding Steam Stone
+			override_spellId[403336] = nil --Indomitable Earth Stone
+			override_spellId[403392] = nil --Cold Frost Stone
+			override_spellId[403376] = nil --Gleaming Iron Stone
+			override_spellId[403253] = nil --Raging Magma Stone
+			override_spellId[403257] = nil --Searing Smokey Stone
+		end
+
 		damage_cache = setmetatable({}, _detalhes.weaktable)
 		damage_cache_pets = setmetatable({}, _detalhes.weaktable)
 		damage_cache_petsOwners = setmetatable({}, _detalhes.weaktable)
diff --git a/frames/window_options2_sections.lua b/frames/window_options2_sections.lua
index 389542a27..c5a5351a2 100644
--- a/frames/window_options2_sections.lua
+++ b/frames/window_options2_sections.lua
@@ -7022,6 +7022,19 @@ do
                 boxfirst = true,
             },
 
+            {--merge gemstone 10.0.7
+                type = "toggle",
+                get = function() return Details.combat_log.merge_gemstones_1007 end,
+                set = function(self, fixedparam, value)
+                    Details.combat_log.merge_gemstones_1007 = value
+                    afterUpdate()
+                    Details:ClearParserCache()
+                end,
+                name = "Merge Primordial Stones 10.0.7",
+                desc = "Merge Primordial Stones 10.0.7",
+                boxfirst = true,
+            },
+
             {type = "blank"},
             {type = "label", get = function() return "Class Options:" end, text_template = subSectionTitleTextTemplate},
 
@@ -7037,8 +7050,7 @@ do
                 desc = "Hunter Track Pet Frenzy",
                 boxfirst = true,
             },
-            
-            
+
         }
 
         sectionFrame.sectionOptions = sectionOptions
diff --git a/functions/profiles.lua b/functions/profiles.lua
index dbf561af1..88f32e881 100644
--- a/functions/profiles.lua
+++ b/functions/profiles.lua
@@ -1148,6 +1148,7 @@ local default_player_data = {
 			inverse_deathlog_mplus = false,
 			inverse_deathlog_overalldata = false,
 			track_hunter_frenzy = false,
+			merge_gemstones_1007 = false,
 		},
 
 		--this is used by the new data capture for charts