diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp
index f0404fad2..596998cb5 100644
--- a/src/game/Spell.cpp
+++ b/src/game/Spell.cpp
@@ -7904,6 +7904,7 @@ void Spell::GetSpellRangeAndRadius(SpellEffectEntry const* spellEffect, float& r
                 case 54148:                                 // Ritual of the Sword (Utgarde Pinnacle, Svala)
                 case 55479:                                 // Forced Obedience (Naxxramas, Razovius)
                 case 56140:                                 // Summon Power Spark (Eye of Eternity, Malygos)
+                case 57578:                                 // Lava Strike (Obsidian Sanctum, Sartharion)
                 case 59870:                                 // Glare of the Tribunal (h) (Halls of Stone)
                 case 62016:                                 // Charge Orb (Ulduar, Thorim)
                 case 62042:                                 // Stormhammer (Ulduar, Thorim)
diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp
index ed5f75244..1c20a6787 100644
--- a/src/game/SpellEffects.cpp
+++ b/src/game/SpellEffects.cpp
@@ -2643,6 +2643,14 @@ void Spell::EffectDummy(SpellEffectEntry const* effect)
                     unitTarget->CastSpell(unitTarget, 56432, true, NULL, NULL, m_caster->GetObjectGuid());
                     return;
                 }
+                case 57578:                                 // Lava Strike
+                {
+                    if (!unitTarget)
+                        return;
+
+                    m_caster->CastSpell(unitTarget, effect->CalculateSimpleValue(), true);
+                    return;
+                }
                 case 57908:                                 // Stain Cloth
                 {
                     // nothing do more
diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp
index 72fa773e0..5bc7ed1c8 100644
--- a/src/game/SpellMgr.cpp
+++ b/src/game/SpellMgr.cpp
@@ -2170,6 +2170,11 @@ bool SpellMgr::IsNoStackSpellDueToSpell(uint32 spellId_1, uint32 spellId_2) cons
                             (spellInfo_2->Id == 57494 && spellInfo_1->Id == 57492))
                         return false;
 
+                    // Cyclone Aura 2 and Cyclone Aura
+                    if ((spellInfo_1->Id == 57598 && spellInfo_2->Id == 57560) ||
+                            (spellInfo_2->Id == 57598 && spellInfo_1->Id == 57560))
+                        return false;
+
                     break;
                 }
                 case SPELLFAMILY_MAGE:
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index c3e3c0742..32957bbab 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "12623"
+ #define REVISION_NR "12624"
 #endif // __REVISION_NR_H__