diff --git a/Generals/Code/GameEngine/Source/Common/MessageStream.cpp b/Generals/Code/GameEngine/Source/Common/MessageStream.cpp
index b970e457bf0..2d595957cae 100644
--- a/Generals/Code/GameEngine/Source/Common/MessageStream.cpp
+++ b/Generals/Code/GameEngine/Source/Common/MessageStream.cpp
@@ -500,11 +500,11 @@ const char *GameMessage::getCommandTypeAsString(GameMessage::Type t)
 
 #if defined(RTS_DEBUG)
 	CASE_LABEL(MSG_META_DEMO_TOGGLE_AUDIODEBUG)
-#endif//defined(RTS_DEBUG)
+#endif
 
 #ifdef DUMP_PERF_STATS
 	CASE_LABEL(MSG_META_DEMO_PERFORM_STATISTICAL_DUMP)
-#endif//DUMP_PERF_STATS
+#endif
 
 	CASE_LABEL(MSG_META_PLACE_BEACON)
 	CASE_LABEL(MSG_META_REMOVE_BEACON)
@@ -516,7 +516,7 @@ const char *GameMessage::getCommandTypeAsString(GameMessage::Type t)
 	CASE_LABEL(MSG_BEGIN_AREA_SELECTION_HINT)
 	CASE_LABEL(MSG_END_AREA_SELECTION_HINT)
 	CASE_LABEL(MSG_DO_ATTACK_OBJECT_HINT)
-	CASE_LABEL(MSG_DO_ATTACK_OBJECT_AFTER_MOVING_HINT)
+	CASE_LABEL(MSG_IMPOSSIBLE_ATTACK_HINT)
 	CASE_LABEL(MSG_DO_FORCE_ATTACK_OBJECT_HINT)
 	CASE_LABEL(MSG_DO_FORCE_ATTACK_GROUND_HINT)
 	CASE_LABEL(MSG_GET_REPAIRED_HINT)
@@ -532,7 +532,6 @@ const char *GameMessage::getCommandTypeAsString(GameMessage::Type t)
 	CASE_LABEL(MSG_FIREBOMB_HINT)
 	CASE_LABEL(MSG_CONVERT_TO_CARBOMB_HINT)
 	CASE_LABEL(MSG_CAPTUREBUILDING_HINT)
-	CASE_LABEL(MSG_HACK_HINT)
 
 #ifdef ALLOW_SURRENDER
 	CASE_LABEL(MSG_PICK_UP_PRISONER_HINT)
@@ -541,8 +540,11 @@ const char *GameMessage::getCommandTypeAsString(GameMessage::Type t)
 	CASE_LABEL(MSG_SNIPE_VEHICLE_HINT)
 	CASE_LABEL(MSG_DEFECTOR_HINT)
 	CASE_LABEL(MSG_SET_RALLY_POINT_HINT)
+	CASE_LABEL(MSG_DO_SPECIAL_POWER_OVERRIDE_DESTINATION_HINT)
 	CASE_LABEL(MSG_DO_SALVAGE_HINT)
 	CASE_LABEL(MSG_DO_INVALID_HINT)
+	CASE_LABEL(MSG_DO_ATTACK_OBJECT_AFTER_MOVING_HINT)
+	CASE_LABEL(MSG_HACK_HINT)
 	CASE_LABEL(MSG_BEGIN_NETWORK_MESSAGES)
 	CASE_LABEL(MSG_CREATE_SELECTED_GROUP)
 	CASE_LABEL(MSG_CREATE_SELECTED_GROUP_NO_SOUND)
@@ -621,17 +623,7 @@ const char *GameMessage::getCommandTypeAsString(GameMessage::Type t)
 	CASE_LABEL(MSG_DO_SCATTER)
 	CASE_LABEL(MSG_INTERNET_HACK)
 	CASE_LABEL(MSG_DO_CHEER)
-
-#ifdef ALLOW_SURRENDER
-	CASE_LABEL(MSG_DO_SURRENDER)
-#endif
-
 	CASE_LABEL(MSG_TOGGLE_OVERCHARGE)
-
-#ifdef ALLOW_SURRENDER
-	CASE_LABEL(MSG_RETURN_TO_PRISON)
-#endif
-
 	CASE_LABEL(MSG_SWITCH_WEAPONS)
 	CASE_LABEL(MSG_CONVERT_TO_CARBOMB)
 	CASE_LABEL(MSG_CAPTUREBUILDING)
@@ -639,11 +631,7 @@ const char *GameMessage::getCommandTypeAsString(GameMessage::Type t)
 	CASE_LABEL(MSG_STEALCASH_HACK)
 	CASE_LABEL(MSG_DISABLEBUILDING_HACK)
 	CASE_LABEL(MSG_SNIPE_VEHICLE)
-
-#ifdef ALLOW_SURRENDER
-	CASE_LABEL(MSG_PICK_UP_PRISONER)
-#endif
-
+	CASE_LABEL(MSG_DO_SPECIAL_POWER_OVERRIDE_DESTINATION)
 	CASE_LABEL(MSG_DO_SALVAGE)
 	CASE_LABEL(MSG_CLEAR_INGAME_POPUP_MESSAGE)
 	CASE_LABEL(MSG_PLACE_BEACON)
@@ -653,6 +641,8 @@ const char *GameMessage::getCommandTypeAsString(GameMessage::Type t)
 	CASE_LABEL(MSG_SELF_DESTRUCT)
 	CASE_LABEL(MSG_CREATE_FORMATION)
 	CASE_LABEL(MSG_LOGIC_CRC)
+	CASE_LABEL(MSG_SET_MINE_CLEARING_DETAIL)
+	CASE_LABEL(MSG_BEGIN_DEBUG_NETWORK_MESSAGES)
 
 #if defined(RTS_DEBUG)
 	CASE_LABEL(MSG_DEBUG_KILL_SELECTION)
@@ -667,7 +657,12 @@ const char *GameMessage::getCommandTypeAsString(GameMessage::Type t)
 	CASE_LABEL(MSG_OBJECT_POSITION)
 	CASE_LABEL(MSG_OBJECT_ORIENTATION)
 	CASE_LABEL(MSG_OBJECT_JOINED_TEAM)
-	CASE_LABEL(MSG_SET_MINE_CLEARING_DETAIL)
+
+#ifdef ALLOW_SURRENDER
+	CASE_LABEL(MSG_DO_SURRENDER)
+	CASE_LABEL(MSG_RETURN_TO_PRISON)
+	CASE_LABEL(MSG_PICK_UP_PRISONER)
+#endif
 	}
 
 #undef CASE_LABEL
diff --git a/GeneralsMD/Code/GameEngine/Source/Common/MessageStream.cpp b/GeneralsMD/Code/GameEngine/Source/Common/MessageStream.cpp
index 0addbe79dac..44d8ef27c80 100644
--- a/GeneralsMD/Code/GameEngine/Source/Common/MessageStream.cpp
+++ b/GeneralsMD/Code/GameEngine/Source/Common/MessageStream.cpp
@@ -378,9 +378,14 @@ const char *GameMessage::getCommandTypeAsString(GameMessage::Type t)
 	CASE_LABEL(MSG_META_END_CAMERA_ZOOM_OUT)
 	CASE_LABEL(MSG_META_CAMERA_RESET)
 	CASE_LABEL(MSG_META_TOGGLE_CAMERA_TRACKING_DRAWABLE)
+	CASE_LABEL(MSG_META_TOGGLE_FAST_FORWARD_REPLAY)
+	CASE_LABEL(MSG_META_TOGGLE_PAUSE)
+	CASE_LABEL(MSG_META_TOGGLE_PAUSE_ALT)
+	CASE_LABEL(MSG_META_STEP_FRAME)
+	CASE_LABEL(MSG_META_STEP_FRAME_ALT)
 	CASE_LABEL(MSG_META_DEMO_INSTANT_QUIT)
 
-#if defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)//may be defined in GameCommon.h
+#if defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)
 	CASE_LABEL(MSG_CHEAT_RUNSCRIPT1)
 	CASE_LABEL(MSG_CHEAT_RUNSCRIPT2)
 	CASE_LABEL(MSG_CHEAT_RUNSCRIPT3)
@@ -403,12 +408,6 @@ const char *GameMessage::getCommandTypeAsString(GameMessage::Type t)
 	CASE_LABEL(MSG_CHEAT_TOGGLE_MESSAGE_TEXT)
 #endif
 
-	CASE_LABEL(MSG_META_TOGGLE_FAST_FORWARD_REPLAY)
-	CASE_LABEL(MSG_META_TOGGLE_PAUSE)
-	CASE_LABEL(MSG_META_TOGGLE_PAUSE_ALT)
-	CASE_LABEL(MSG_META_STEP_FRAME)
-	CASE_LABEL(MSG_META_STEP_FRAME_ALT)
-
 #if defined(RTS_DEBUG)
 	CASE_LABEL(MSG_META_DEMO_TOGGLE_BEHIND_BUILDINGS)
 	CASE_LABEL(MSG_META_DEMO_TOGGLE_LETTERBOX)
@@ -530,11 +529,11 @@ const char *GameMessage::getCommandTypeAsString(GameMessage::Type t)
 
 #if defined(RTS_DEBUG)
 	CASE_LABEL(MSG_META_DEMO_TOGGLE_AUDIODEBUG)
-#endif//defined(RTS_DEBUG)
+#endif
 
 #ifdef DUMP_PERF_STATS
 	CASE_LABEL(MSG_META_DEMO_PERFORM_STATISTICAL_DUMP)
-#endif//DUMP_PERF_STATS
+#endif
 
 	CASE_LABEL(MSG_META_PLACE_BEACON)
 	CASE_LABEL(MSG_META_REMOVE_BEACON)
@@ -546,7 +545,7 @@ const char *GameMessage::getCommandTypeAsString(GameMessage::Type t)
 	CASE_LABEL(MSG_BEGIN_AREA_SELECTION_HINT)
 	CASE_LABEL(MSG_END_AREA_SELECTION_HINT)
 	CASE_LABEL(MSG_DO_ATTACK_OBJECT_HINT)
-	CASE_LABEL(MSG_DO_ATTACK_OBJECT_AFTER_MOVING_HINT)
+	CASE_LABEL(MSG_IMPOSSIBLE_ATTACK_HINT)
 	CASE_LABEL(MSG_DO_FORCE_ATTACK_OBJECT_HINT)
 	CASE_LABEL(MSG_DO_FORCE_ATTACK_GROUND_HINT)
 	CASE_LABEL(MSG_GET_REPAIRED_HINT)
@@ -563,7 +562,6 @@ const char *GameMessage::getCommandTypeAsString(GameMessage::Type t)
 	CASE_LABEL(MSG_FIREBOMB_HINT)
 	CASE_LABEL(MSG_CONVERT_TO_CARBOMB_HINT)
 	CASE_LABEL(MSG_CAPTUREBUILDING_HINT)
-	CASE_LABEL(MSG_HACK_HINT)
 
 #ifdef ALLOW_SURRENDER
 	CASE_LABEL(MSG_PICK_UP_PRISONER_HINT)
@@ -572,8 +570,11 @@ const char *GameMessage::getCommandTypeAsString(GameMessage::Type t)
 	CASE_LABEL(MSG_SNIPE_VEHICLE_HINT)
 	CASE_LABEL(MSG_DEFECTOR_HINT)
 	CASE_LABEL(MSG_SET_RALLY_POINT_HINT)
+	CASE_LABEL(MSG_DO_SPECIAL_POWER_OVERRIDE_DESTINATION_HINT)
 	CASE_LABEL(MSG_DO_SALVAGE_HINT)
 	CASE_LABEL(MSG_DO_INVALID_HINT)
+	CASE_LABEL(MSG_DO_ATTACK_OBJECT_AFTER_MOVING_HINT)
+	CASE_LABEL(MSG_HACK_HINT)
 	CASE_LABEL(MSG_BEGIN_NETWORK_MESSAGES)
 	CASE_LABEL(MSG_CREATE_SELECTED_GROUP)
 	CASE_LABEL(MSG_CREATE_SELECTED_GROUP_NO_SOUND)
@@ -652,17 +653,7 @@ const char *GameMessage::getCommandTypeAsString(GameMessage::Type t)
 	CASE_LABEL(MSG_DO_SCATTER)
 	CASE_LABEL(MSG_INTERNET_HACK)
 	CASE_LABEL(MSG_DO_CHEER)
-
-#ifdef ALLOW_SURRENDER
-	CASE_LABEL(MSG_DO_SURRENDER)
-#endif
-
 	CASE_LABEL(MSG_TOGGLE_OVERCHARGE)
-
-#ifdef ALLOW_SURRENDER
-	CASE_LABEL(MSG_RETURN_TO_PRISON)
-#endif
-
 	CASE_LABEL(MSG_SWITCH_WEAPONS)
 	CASE_LABEL(MSG_CONVERT_TO_CARBOMB)
 	CASE_LABEL(MSG_CAPTUREBUILDING)
@@ -670,11 +661,7 @@ const char *GameMessage::getCommandTypeAsString(GameMessage::Type t)
 	CASE_LABEL(MSG_STEALCASH_HACK)
 	CASE_LABEL(MSG_DISABLEBUILDING_HACK)
 	CASE_LABEL(MSG_SNIPE_VEHICLE)
-
-#ifdef ALLOW_SURRENDER
-	CASE_LABEL(MSG_PICK_UP_PRISONER)
-#endif
-
+	CASE_LABEL(MSG_DO_SPECIAL_POWER_OVERRIDE_DESTINATION)
 	CASE_LABEL(MSG_DO_SALVAGE)
 	CASE_LABEL(MSG_CLEAR_INGAME_POPUP_MESSAGE)
 	CASE_LABEL(MSG_PLACE_BEACON)
@@ -684,8 +671,11 @@ const char *GameMessage::getCommandTypeAsString(GameMessage::Type t)
 	CASE_LABEL(MSG_SELF_DESTRUCT)
 	CASE_LABEL(MSG_CREATE_FORMATION)
 	CASE_LABEL(MSG_LOGIC_CRC)
+	CASE_LABEL(MSG_SET_MINE_CLEARING_DETAIL)
+	CASE_LABEL(MSG_ENABLE_RETALIATION_MODE)
+	CASE_LABEL(MSG_BEGIN_DEBUG_NETWORK_MESSAGES)
 
-#if defined(RTS_DEBUG)
+#if defined(RTS_DEBUG) || defined(_ALLOW_DEBUG_CHEATS_IN_RELEASE)
 	CASE_LABEL(MSG_DEBUG_KILL_SELECTION)
 	CASE_LABEL(MSG_DEBUG_HURT_OBJECT)
 	CASE_LABEL(MSG_DEBUG_KILL_OBJECT)
@@ -698,8 +688,12 @@ const char *GameMessage::getCommandTypeAsString(GameMessage::Type t)
 	CASE_LABEL(MSG_OBJECT_POSITION)
 	CASE_LABEL(MSG_OBJECT_ORIENTATION)
 	CASE_LABEL(MSG_OBJECT_JOINED_TEAM)
-	CASE_LABEL(MSG_SET_MINE_CLEARING_DETAIL)
-	CASE_LABEL(MSG_ENABLE_RETALIATION_MODE)
+
+#ifdef ALLOW_SURRENDER
+	CASE_LABEL(MSG_DO_SURRENDER)
+	CASE_LABEL(MSG_RETURN_TO_PRISON)
+	CASE_LABEL(MSG_PICK_UP_PRISONER)
+#endif
 	}
 
 #undef CASE_LABEL