diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
index 352391890..67b0c015b 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/AbilData.xml
@@ -11023,6 +11023,28 @@
             <Button DefaultButtonFace="AP_HunterlingSummon" State="Restricted" Requirements="AP_ZergMercCompoundSC2"/>
             <Unit value="AP_Hunterling"/>
         </InfoArray>
+        <InfoArray index="Train8" Effect="AP_MercGroundDrop">
+            <Charge>
+                <CountMax value="3"/>
+                <CountStart value="3"/>
+                <CountUse value="1"/>
+                <Link value="AP_MercZerglings"/>
+                <Location value="Player"/>
+            </Charge>
+            <Cooldown>
+                <Link value="AP_MercZerglings"/>
+                <Location value="Player"/>
+                <TimeStart value="240"/>
+                <TimeUse value="240"/>
+            </Cooldown>
+            <Button DefaultButtonFace="AP_MercZergling" State="Restricted" Requirements="AP_ZergMercCompoundBroodWarAndHaveSwarmling"/>
+            <Unit value="AP_MercZergling"/>
+            <Unit value="AP_MercZergling"/>
+            <Unit value="AP_MercZergling"/>
+            <Unit value="AP_MercZergling"/>
+            <Unit value="AP_MercZergling"/>
+            <Unit value="AP_MercZergling"/>
+        </InfoArray>
     </CAbilTrain>
     <CAbilEffectTarget id="AP_DarkTemplarShadowDash">
         <AbilSetId value="Blnk"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml
index c816df86d..888173525 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ActorData.xml
@@ -18814,6 +18814,8 @@
         <On Terms="Abil.AP_FungalGrowth.SourceCastStart" Send="$Spell"/>
         <On Terms="Abil.AP_SpawnLarva.SourceCastStart" Send="AnimPlay SpellA Spell,A"/>
         <On Terms="Abil.AP_Transfusion.SourceFinishStart" Send="AnimPlay SpellB Spell,B"/>
+        <On Terms="Abil.AP_QueenBurstHeal.SourceFinishStart" Send="AnimPlay SpellB Spell,B"/>
+        <On Terms="Abil.AP_QueenBioMechBurstHeal.SourceFinishStart" Send="AnimPlay SpellB Spell,B"/>
         <On Terms="AbilMorph.*.Start; AbilKey BurrowDown" Send="Create BurrowDownLarge"/>
         <On Terms="AbilMorph.*.Cancel; MorphFrom AP_Queen; MorphTo AP_QueenBurrowed" Send="AnimClear Burrow"/>
         <On Terms="AbilMorph.*.Finish; MorphTo AP_Queen; MorphFrom AP_QueenBurrowed" Send="AnimBracketStop Burrow"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
index e1c650897..cbc426415 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementData.xml
@@ -4061,4 +4061,7 @@
     <CRequirement id="AP_HaveMedicMengskVeterancyLevel3">
         <NodeArray index="Use" Link="AP_GTECountBehaviorMengskVeterancyMedicMengskCompleteOnlyAtUnit3"/>
     </CRequirement>
+    <CRequirement id="AP_ZergMercCompoundBroodWarAndHaveSwarmling">
+        <NodeArray index="Show" Link="AP_AndHotSHaveSwarmlingCompleteOnlyZergMercCompoundBroodWarSelectedCompleteOnly"/>
+    </CRequirement>
 </Catalog>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
index a684ef6a0..a32788e12 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/RequirementNodeData.xml
@@ -6633,6 +6633,10 @@
         <OperandArray index="0" value="AP_CountBehaviorMengskVeterancyMarineMengskCompleteOnlyAtUnit"/>
         <OperandArray index="1" value="4"/>
     </CRequirementGTE>
+    <CRequirementAnd id="AP_AndHotSHaveSwarmlingCompleteOnlyZergMercCompoundBroodWarSelectedCompleteOnly">
+        <OperandArray value="AP_CountUpgradeZergMercCompoundBroodWarSelectedCompleteOnly"/>
+        <OperandArray value="AP_CountUpgradeAP_HotSHaveSwarmlingCompleteOnly"/>
+    </CRequirementAnd>
     <CRequirementCountBehavior id="AP_CountBehaviorMengskVeterancyGoliathMengskCompleteOnlyAtUnit">
         <Flags index="TechTreeCheat" value="0"/>
         <Count Link="AP_MengskVeterancyGoliathMengsk" State="CompleteOnlyAtUnit"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
index 09f9b32b8..fac8667d5 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UnitData.xml
@@ -12851,7 +12851,7 @@
         <EditorCategories value="ObjectType:Unit,ObjectFamily:Melee"/>
         <HotkeyAlias value=""/>
     </CUnit>
-    <CUnit id="AP_Broodling" parent="BroodlingDefault">
+    <CUnit id="AP_Broodling" parent="AP_BroodlingDefault">
         <Name value="Unit/Name/AP_Broodling"/>
         <Description value="Button/Tooltip/AP_Broodling"/>
         <Mob value="Multiplayer"/>
@@ -12881,7 +12881,7 @@
         <GlossaryPriority value="200"/>
         <HotkeyCategory value="Unit/Category/AP_ZergUnits"/>
     </CUnit>
-    <CUnit id="AP_BroodlingEscort" parent="BroodlingDefault">
+    <CUnit id="AP_BroodlingEscort" parent="AP_BroodlingDefault">
         <FlagArray index="Uncommandable" value="1"/>
         <FlagArray index="Unselectable" value="1"/>
         <FlagArray index="Untargetable" value="1"/>
@@ -19577,7 +19577,7 @@
         <Race value="Zerg"/>
         <EditorCategories value="ObjectType:Projectile,ObjectFamily:Melee"/>
     </CUnit>
-    <CUnit id="AP_Roachling" parent="BroodlingDefault">
+    <CUnit id="AP_Roachling" parent="AP_BroodlingDefault">
         <Name value="Unit/Name/AP_Roachling"/>
         <Mob value="Multiplayer"/>
         <FlagArray index="UseLineOfSight" value="1"/>
@@ -19721,6 +19721,7 @@
         <AttackTargetPriority value="20"/>
         <AbilArray Link="AP_BurrowRavagerUp"/>
         <AbilArray Link="AP_DeepTunnel"/>
+        <AbilArray Link="AP_RavagerCorrosiveBile"/>
         <BehaviorArray Link="AP_MalignantCreepFix"/>
         <CardLayouts>
             <LayoutButtons Face="Attack" Type="AbilCmd" AbilCmd="attack,Execute" Row="0" Column="4"/>
@@ -25848,6 +25849,7 @@
         <BehaviorArray Link="AP_ZergMercCompoundTabNotSelected"/>
         <CardLayouts>
             <!-- Brood War -->
+            <LayoutButtons Face="AP_MercZergling" Type="AbilCmd" AbilCmd="AP_SummonZergMercs,Train8" Row="0" Column="0"/>
             <LayoutButtons Face="AP_MercZergling" Type="AbilCmd" AbilCmd="AP_SummonZergMercs,Train4" Row="0" Column="0"/>
             <LayoutButtons Face="AP_SummonHunterKiller" Type="AbilCmd" AbilCmd="AP_SummonZergMercs,Train5" Row="0" Column="1"/>
             <LayoutButtons Face="AP_MercUltraliskSummon" Type="AbilCmd" AbilCmd="AP_SummonZergMercs,Train6" Row="0" Column="2"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
index 629943967..109c16b1f 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/UpgradeData.xml
@@ -9283,6 +9283,7 @@
         <EffectArray Operation="Set" Reference="Unit,AP_ZerglingBurrowed,Subtitle" Value="AP_Swarmling"/>
         <EffectArray Reference="Effect,AP_K5DropPodZerglings,SpawnCount" Value="4"/>
         <EffectArray Reference="Effect,AP_ZerglingRespawnTooltipDummy,SpawnCount" Value="5"/>
+        <EffectArray Operation="Set" Reference="Button,AP_MercZergling,Tooltip" Value="Button/Tooltip/AP_MercZerglingSummonUpg"/>
         <!--        <EffectArray Reference="Unit,AP_SwarmQueen,Food" Value="2"/>-->
         <!--        <EffectArray Reference="Unit,AP_SwarmQueenBurrowed,Food" Value="2"/>-->
         <!--        <EffectArray Reference="Unit,AP_SwarmQueenMorphing,Food" Value="2"/>-->
@@ -13214,6 +13215,9 @@
         <EffectArray Operation="Set" Reference="Abil,AP_SummonZergMercs,InfoArray[Train7].Charge.CountUse" Value="0"/>
         <EffectArray Operation="Set" Reference="Abil,AP_SummonZergMercs,InfoArray[Train7].Charge.CountStart" Value="0"/>
         <EffectArray Operation="Set" Reference="Abil,AP_SummonZergMercs,InfoArray[Train7].Charge.CountMax" Value="0"/>
+        <EffectArray Operation="Set" Reference="Abil,AP_SummonZergMercs,InfoArray[Train8].Charge.CountUse" Value="0"/>
+        <EffectArray Operation="Set" Reference="Abil,AP_SummonZergMercs,InfoArray[Train8].Charge.CountStart" Value="0"/>
+        <EffectArray Operation="Set" Reference="Abil,AP_SummonZergMercs,InfoArray[Train8].Charge.CountMax" Value="0"/>
     </CUpgrade>
     <CUpgrade id="AP_ZergFastBaseBuild">
         <!-- For Lab Rat / etc -->
@@ -15176,6 +15180,7 @@
         <EffectArray Operation="Set" Reference="Abil,AP_SummonZergMercs,InfoArray[Train5].Cooldown.TimeStart" Value="0"/>
         <EffectArray Operation="Set" Reference="Abil,AP_SummonZergMercs,InfoArray[Train6].Cooldown.TimeStart" Value="0"/>
         <EffectArray Operation="Set" Reference="Abil,AP_SummonZergMercs,InfoArray[Train7].Cooldown.TimeStart" Value="0"/>
+        <EffectArray Operation="Set" Reference="Abil,AP_SummonZergMercs,InfoArray[Train8].Cooldown.TimeStart" Value="0"/>
     </CUpgrade>
     <CUpgrade id="AP_RapidReinforcement">
         <EffectArray Operation="Subtract" Reference="Abil,AP_SummonMercenaries,InfoArray[Train1].Cooldown.TimeUse" Value="60"/>
@@ -15220,6 +15225,8 @@
         <EffectArray Operation="Subtract" Reference="Abil,AP_SummonZergMercs,InfoArray[Train6].Cooldown.TimeStart" Value="60"/>
         <EffectArray Operation="Subtract" Reference="Abil,AP_SummonZergMercs,InfoArray[Train7].Cooldown.TimeUse" Value="60"/>
         <EffectArray Operation="Subtract" Reference="Abil,AP_SummonZergMercs,InfoArray[Train7].Cooldown.TimeStart" Value="60"/>
+        <EffectArray Operation="Subtract" Reference="Abil,AP_SummonZergMercs,InfoArray[Train8].Cooldown.TimeUse" Value="60"/>
+        <EffectArray Operation="Subtract" Reference="Abil,AP_SummonZergMercs,InfoArray[Train8].Cooldown.TimeStart" Value="60"/>
     </CUpgrade>
     <CUpgrade id="AP_FusionCoreFusionReactor"/>
     <CUpgrade id="AP_DevastatorTurretPunisherGrenades">
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml
index b12adfb2c..9ac240e51 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml
+++ b/Mods/ArchipelagoPlayer.SC2Mod/Base.SC2Data/GameData/ValidatorData.xml
@@ -4186,11 +4186,16 @@
     <CValidatorCombine id="AP_NotTimedLifeUnitAndNotLarva">
         <Type value="And"/>
 <!--        <CombineArray value="NotInfestedTerran"/>-->
+        <CombineArray value="AP_NotInfestorTerran"/>
+        <CombineArray value="AP_NotInfestorTerranBurrowed"/>
+        <CombineArray value="AP_NotHasSIBarracksTrainTimedLife"/>
+        <CombineArray value="AP_NotHasSIBunkerTrainTimedLife"/>
 <!--        <CombineArray value="NotInfestedTerranCampaign"/>-->
 <!--        <CombineArray value="NotInfestedTerranCampaignBurrowed"/>-->
 <!--        <CombineArray value="NotStukovInfestedTerran"/>-->
 <!--        <CombineArray value="NotKerriganInfestedTerran"/>-->
 <!--        <CombineArray value="NotKerriganInfestedTerranBurrowed"/>-->
+        <CombineArray value="AP_NotHasTimedLife"/>
         <CombineArray value="AP_NotLocust"/>
         <CombineArray value="AP_NotBroodling"/>
 <!--        <CombineArray value="NotKerriganNydusWyrm"/>-->
@@ -4210,6 +4215,26 @@
         <Value value="AP_Broodling"/>
         <Find value="0"/>
     </CValidatorUnitType>
+    <CValidatorUnitType id="AP_NotInfestorTerran">
+        <Value value="AP_InfestorTerran"/>
+        <Find value="0"/>
+    </CValidatorUnitType>
+    <CValidatorUnitType id="AP_NotInfestorTerranBurrowed">
+        <Value value="AP_InfestorTerranBurrowed"/>
+        <Find value="0"/>
+    </CValidatorUnitType>
+    <CValidatorUnitCompareBehaviorCount id="AP_NotHasTimedLife">
+        <Behavior value="TimedLife"/>
+        <Value value="0"/>
+    </CValidatorUnitCompareBehaviorCount>
+    <CValidatorUnitCompareBehaviorCount id="AP_NotHasSIBarracksTrainTimedLife">
+        <Behavior value="AP_SIBarracksTrainTimedLife"/>
+        <Value value="0"/>
+    </CValidatorUnitCompareBehaviorCount>
+    <CValidatorUnitCompareBehaviorCount id="AP_NotHasSIBunkerTrainTimedLife">
+        <Behavior value="AP_SIInfestedBunkerTrainTimedLife"/>
+        <Value value="0"/>
+    </CValidatorUnitCompareBehaviorCount>
     <CValidatorUnitCompareBehaviorCount id="AP_NoQueenBurstHeal">
         <Behavior value="AP_QueenBurstHeal"/>
         <ResultFailed value="Error,Error/QueenAlreadyHealing"/>
diff --git a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
index 4012759a4..a2f946be0 100644
--- a/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
+++ b/Mods/ArchipelagoPlayer.SC2Mod/enUS.SC2Data/LocalizedData/GameStrings.txt
@@ -2676,6 +2676,7 @@ Button/Tooltip/AP_MercVehicle=Show available <c val="ffff8a">Vehicle</c> type un
 Button/Tooltip/AP_MercWraith=Once the personal escort force for the Emperor, large swaths of the legendary Winged Nightmare squadron went AWOL after Arcturus’s culpability for Tarsonis was made public. The traitors have since been scrubbed from the Royal Guard’s records, and go from job to job staying one step ahead of Arcturus’s assassins.<n/><n/><c val="ffff8a">Can attack ground and air units.</c>
 Button/Tooltip/AP_MercZergling=A powerful strain of zergling from the Brood War.
 Button/Tooltip/AP_MercZerglingSummon=Spawn four Devouring Ones, a powerful strain of zerglings from the Brood War.
+Button/Tooltip/AP_MercZerglingSummonUpg=Spawn six Devouring Ones, a powerful strain of zerglings from the Brood War.
 Button/Tooltip/AP_MicroFiltering=This refinery is producing Vespene gas 25% faster
 Button/Tooltip/AP_MindBolt=Kerrigan deals <d ref="Effect,AP_MindBoltDamage,Amount"/> damage to target unit or structure from long range.
 Button/Tooltip/AP_MindControl=Permanently converts targeted Zerg unit to player control.<n/><n/><c val="#ColorAttackInfo">Heroic units are immune.</c>