diff --git a/sp/src/game/server/hl2/npc_combine.cpp b/sp/src/game/server/hl2/npc_combine.cpp
index 3a643ff7..73f58af5 100644
--- a/sp/src/game/server/hl2/npc_combine.cpp
+++ b/sp/src/game/server/hl2/npc_combine.cpp
@@ -43,9 +43,13 @@ int g_fCombineQuestion;				// true if an idle grunt asked a question. Cleared wh
 #ifdef MAPBASE
 ConVar npc_combine_idle_walk_easy( "npc_combine_idle_walk_easy", "1", FCVAR_NONE, "Mapbase: Allows Combine soldiers to use ACT_WALK_EASY as a walking animation when idle." );
 ConVar npc_combine_unarmed_anims( "npc_combine_unarmed_anims", "1", FCVAR_NONE, "Mapbase: Allows Combine soldiers to use unarmed idle/walk animations when they have no weapon." );
+ConVar npc_combine_protected_run( "npc_combine_protected_run", "0", FCVAR_NONE, "Mapbase: Allows Combine soldiers to use \"protected run\" animations." );
 ConVar npc_combine_altfire_not_allies_only( "npc_combine_altfire_not_allies_only", "1", FCVAR_NONE, "Mapbase: Elites are normally only allowed to fire their alt-fire attack at the player and the player's allies; This allows elites to alt-fire at other enemies too." );
 
 ConVar npc_combine_new_cover_behavior( "npc_combine_new_cover_behavior", "1", FCVAR_NONE, "Mapbase: Toggles small patches for parts of npc_combine AI related to soldiers failing to take cover. These patches are minimal and only change cases where npc_combine would otherwise look at an enemy without shooting or run up to the player to melee attack when they don't have to. Consult the Mapbase wiki for more information." );
+
+extern acttable_t *GetSMG1Acttable();
+extern acttable_t *GetPistolActtable();
 #endif
 
 #define COMBINE_SKIN_DEFAULT		0
@@ -129,6 +133,11 @@ Activity ACT_WALK_MARCH;
 #ifdef MAPBASE
 Activity ACT_IDLE_UNARMED;
 Activity ACT_WALK_UNARMED;
+Activity ACT_RUN_UNARMED;
+Activity ACT_WALK_EASY_PISTOL;
+Activity ACT_TURRET_CARRY_IDLE;
+Activity ACT_TURRET_CARRY_WALK;
+Activity ACT_TURRET_CARRY_RUN;
 #endif
 
 // -----------------------------------------------
@@ -1540,11 +1549,6 @@ void CNPC_Combine::BuildScheduleTestBits( void )
 //-----------------------------------------------------------------------------
 Activity CNPC_Combine::Weapon_TranslateActivity( Activity eNewActivity, bool *pRequired )
 {
-	// We have differing low animations and ACT_CROUCHIDLE is not friendly to weapon translation.
-	// ACT_CROUCHIDLE is pretty much deprecated at this point anyway.
-	if (eNewActivity == ACT_CROUCHIDLE)
-		eNewActivity = ACT_RANGE_AIM_LOW;
-
 	return BaseClass::Weapon_TranslateActivity(eNewActivity, pRequired);
 }
 
@@ -1636,10 +1640,24 @@ Activity CNPC_Combine::NPC_TranslateActivity( Activity eNewActivity )
 			eNewActivity = ACT_IDLE_UNARMED;
 		else if (eNewActivity == ACT_WALK)
 			eNewActivity = ACT_WALK_UNARMED;
+		else if (eNewActivity == ACT_RUN)
+			eNewActivity = ACT_RUN_UNARMED;
 	}
-	else if (eNewActivity == ACT_WALK && m_NPCState == NPC_STATE_IDLE && npc_combine_idle_walk_easy.GetBool() && HaveSequenceForActivity(ACT_WALK_EASY))
+	else if (m_NPCState == NPC_STATE_IDLE && npc_combine_idle_walk_easy.GetBool() && HaveSequenceForActivity(ACT_WALK_EASY))
 	{
-		eNewActivity = ACT_WALK_EASY;
+		if (eNewActivity == ACT_WALK && GetActiveWeapon())
+		{
+			if (GetActiveWeapon()->GetBackupActivityList() == GetSMG1Acttable())
+				eNewActivity = ACT_WALK_EASY;
+			else if (GetActiveWeapon()->GetBackupActivityList() == GetPistolActtable())
+				eNewActivity = ACT_WALK_EASY_PISTOL;
+		}
+	}
+
+	if ( eNewActivity == ACT_RUN && ( IsCurSchedule( SCHED_TAKE_COVER_FROM_BEST_SOUND ) || IsCurSchedule( SCHED_FLEE_FROM_BEST_SOUND ) ) )
+	{
+		if ( random->RandomInt( 0, 1 ) && npc_combine_protected_run.GetBool() && HaveSequenceForActivity( ACT_RUN_PROTECTED ) )
+			eNewActivity = ACT_RUN_PROTECTED;
 	}
 #endif
 
@@ -3949,6 +3967,11 @@ DECLARE_ACTIVITY( ACT_WALK_MARCH )
 #ifdef MAPBASE
 DECLARE_ACTIVITY( ACT_IDLE_UNARMED )
 DECLARE_ACTIVITY( ACT_WALK_UNARMED )
+DECLARE_ACTIVITY( ACT_RUN_UNARMED )
+DECLARE_ACTIVITY( ACT_WALK_EASY_PISTOL )
+DECLARE_ACTIVITY( ACT_TURRET_CARRY_IDLE )
+DECLARE_ACTIVITY( ACT_TURRET_CARRY_WALK )
+DECLARE_ACTIVITY( ACT_TURRET_CARRY_RUN )
 #endif
 
 DECLARE_ANIMEVENT( COMBINE_AE_BEGIN_ALTFIRE )
diff --git a/sp/src/game/server/hl2/npc_playercompanion.cpp b/sp/src/game/server/hl2/npc_playercompanion.cpp
index 597f4c7f..7ed8553e 100644
--- a/sp/src/game/server/hl2/npc_playercompanion.cpp
+++ b/sp/src/game/server/hl2/npc_playercompanion.cpp
@@ -1665,21 +1665,6 @@ Activity CNPC_PlayerCompanion::NPC_TranslateActivity( Activity activity )
 			activity = ACT_RUN_PROTECTED;
 	}
 
-#ifdef COMPANION_HOLSTER_WORKAROUND
-	if (activity == ACT_DISARM || activity == ACT_ARM)
-	{
-		CBaseCombatWeapon *pWeapon = GetActiveWeapon() ? GetActiveWeapon() : m_hWeapons[m_iLastHolsteredWeapon];
-		if (pWeapon && pWeapon->WeaponClassify() != WEPCLASS_HANDGUN)
-		{
-			switch (activity)
-			{
-			case ACT_DISARM:	return ACT_DISARM_RIFLE;
-			case ACT_ARM:		return ACT_ARM_RIFLE;
-			}
-		}
-	}
-#endif
-
 	activity = BaseClass::NPC_TranslateActivity( activity );
 
 	if ( activity == ACT_IDLE  )
diff --git a/sp/src/game/server/hl2/weapon_ar2.cpp b/sp/src/game/server/hl2/weapon_ar2.cpp
index dcd0009c..6279c34d 100644
--- a/sp/src/game/server/hl2/weapon_ar2.cpp
+++ b/sp/src/game/server/hl2/weapon_ar2.cpp
@@ -103,7 +103,7 @@ acttable_t	CWeaponAR2::m_acttable[] =
 	{ ACT_COVER_LOW,				ACT_COVER_SMG1_LOW,				false },
 	{ ACT_RANGE_AIM_LOW,			ACT_RANGE_AIM_AR2_LOW,			false },
 	{ ACT_RANGE_ATTACK1_LOW,		ACT_RANGE_ATTACK_AR2_LOW,		false },
-	{ ACT_RELOAD_LOW,				ACT_RELOAD_SMG1_LOW,			false },
+	{ ACT_RELOAD_LOW,				ACT_RELOAD_AR2_LOW,			false },
 	{ ACT_GESTURE_RELOAD,			ACT_GESTURE_RELOAD_AR2,		true },
 //	{ ACT_RANGE_ATTACK2, ACT_RANGE_ATTACK_AR2_GRENADE, true },
 #else
diff --git a/sp/src/game/server/hl2/weapon_smg1.cpp b/sp/src/game/server/hl2/weapon_smg1.cpp
index 97b0e89e..8e889851 100644
--- a/sp/src/game/server/hl2/weapon_smg1.cpp
+++ b/sp/src/game/server/hl2/weapon_smg1.cpp
@@ -93,6 +93,11 @@ acttable_t	CWeaponSMG1::m_acttable[] =
 
 	{ ACT_WALK,						ACT_WALK_RIFLE,					true },
 	{ ACT_WALK_AIM,					ACT_WALK_AIM_RIFLE,				true  },
+
+#ifdef EXPANDED_HL2_WEAPON_ACTIVITIES
+	{ ACT_ARM,						ACT_ARM_RIFLE,					false },
+	{ ACT_DISARM,					ACT_DISARM_RIFLE,				false },
+#endif
 	
 // Readiness activities (not aiming)
 	{ ACT_IDLE_RELAXED,				ACT_IDLE_SMG1_RELAXED,			false },//never aims