diff --git a/Libs/DF/fw.lua b/Libs/DF/fw.lua
index ab74c4bf..0f2f8429 100644
--- a/Libs/DF/fw.lua
+++ b/Libs/DF/fw.lua
@@ -1,5 +1,5 @@
 
-local dversion = 131
+local dversion = 132
 local major, minor = "DetailsFramework-1.0", dversion
 local DF, oldminor = LibStub:NewLibrary (major, minor)
 
diff --git a/Libs/DF/spells.lua b/Libs/DF/spells.lua
index f58449af..9ecb7a9f 100644
--- a/Libs/DF/spells.lua
+++ b/Libs/DF/spells.lua
@@ -605,6 +605,15 @@ DF.CrowdControlSpells = {
 
 	[118] = "MAGE", --Polymorph
 	[61305] = "MAGE", --Polymorph (black cat)
+	[28271] = "MAGE", --Polymorph Turtle
+	[161354] = "MAGE", --Polymorph Monkey
+	[161353] = "MAGE", --Polymorph Polar Bear Cub
+	[126819] = "MAGE", --Polymorph Porcupine
+	[277787] = "MAGE", --Polymorph Direhorn
+	[61721] = "MAGE", --Polymorph Rabbit
+	[28272] = "MAGE", --Polymorph Pig
+	[277792] = "MAGE", --Polymorph Bumblebee
+	
 	[82691] = "MAGE", --Ring of Frost (debuff spellid)
 	[122] = "MAGE", --Frost Nova
 	[157997] = "MAGE", --Ice Nova
diff --git a/boot.lua b/boot.lua
index 6d129c2d..1e2d5694 100644
--- a/boot.lua
+++ b/boot.lua
@@ -4,8 +4,8 @@
 		_ = nil
 		_detalhes = LibStub("AceAddon-3.0"):NewAddon("_detalhes", "AceTimer-3.0", "AceComm-3.0", "AceSerializer-3.0", "NickTag-1.0")
 		
-		_detalhes.build_counter = 6861
-		_detalhes.alpha_build_counter = 6861 --if this is higher than the regular counter, use it instead
+		_detalhes.build_counter = 6866
+		_detalhes.alpha_build_counter = 6866 --if this is higher than the regular counter, use it instead
 		_detalhes.userversion = "v8.1.0." .. _detalhes.build_counter
 		_detalhes.realversion = 135 --core version, this is used to check API version for scripts and plugins (see alias below)
 		_detalhes.APIVersion = _detalhes.realversion --core version
@@ -85,6 +85,7 @@ do
 				269131, --BFA Shrine of the Storm Ancient Mindbender
 				260900, --BFA Waycrest Manor Heartsbane Triad Soul Manipulation
 				260926, --BFA Waycrest Manor Heartsbane Triad Soul Manipulation
+				284995, --BFA Battle of Dazar'alor King Rastakhan Zombie Dust
 			}
 			
 			--must fail in map and encounter id to not store data
diff --git a/core/parser.lua b/core/parser.lua
index 63c5a8f0..a1f0fa92 100644
--- a/core/parser.lua
+++ b/core/parser.lua
@@ -202,6 +202,8 @@
 	local SPELLID_PALADIN_LIGHTMARTYR = 196917
 	--> blood shield g'huun
 	local SPELLNAME_BLOODSHIELD = GetSpellInfo (263217)
+	--> unliving Bwonsamdi
+	local SPELLNAME_UNLIVING = GetSpellInfo (284377)
 	
 	--> spells with special treatment
 	local special_damage_spells = {
@@ -422,7 +424,21 @@
 		--end
 		
 		--rules of specific encounters
-		if (_current_encounter_id == 2122 or _current_encounter_id == 2135) then --g'huun and mythrax --REMOVE ON 9.0 LAUNCH
+		if (_current_encounter_id == 2272) then --king rastakhan --REMOVE ON 9.0 LAUNCH
+			if (alvo_serial) then
+				local npcid = _select (6, _strsplit ("-", alvo_serial))
+				if (npcid == "145644") then --Bwonsamdi
+					--Bwonsamdi has two buffs: unliving and aura of death, checking the two first buff indexes
+					local hasUnlivingBuff1 = _UnitBuff ("boss2", 1)
+					local hasUnlivingBuff2 = _UnitBuff ("boss2", 2)
+					if (hasUnlivingBuff1 == SPELLNAME_UNLIVING or hasUnlivingBuff2 == SPELLNAME_UNLIVING) then
+						--> ignore the damage while Bwonsamdi is immune
+						return
+					end
+				end
+			end
+		
+		elseif (_current_encounter_id == 2122 or _current_encounter_id == 2135) then --g'huun and mythrax --REMOVE ON 9.0 LAUNCH
 			--if (alvo_serial:match ("^Creature%-0%-%d+%-%d+%-%d+%-103679%-%w+$")) then --soul effigy (warlock) --50% more slow than the method below
 		
 			--check if the target is the amorphous cyst
@@ -1351,6 +1367,13 @@
 			return
 		end
 		
+		if (alvo_serial and type (alvo_serial) == "string") then
+			--Ice Block from Jaina encounter REMOVE WHEN BFA IS DONE
+			if (alvo_serial:match ("^Creature%-0%-%d+%-%d+%-%d+%-148522%-%w+$")) then
+				return
+			end
+		end
+
 		if (not who_name) then
 			who_name = "[*] " .. spellName
 		end