Index: binaries/data/config/default.cfg
===================================================================
--- binaries/data/config/default.cfg
+++ binaries/data/config/default.cfg
@@ -390,6 +390,7 @@
 snaptoedges = "disabled"          ; Possible values: disabled, enabled.
 snaptoedgesdistancethreshold = 15 ; On which distance we don't snap to edges
 disjointcontrolgroups = "true"    ; Whether control groups are disjoint sets or entities can be in multiple control groups at the same time.
+defaultformation = "special/formations/box" ; For walking orders, automatically put units into this formation if they don't have one already.
 
 [gui.session.minimap]
 blinkduration = 1.7               ; The blink duration while pinging
Index: binaries/data/mods/public/globalscripts/Formation.js
===================================================================
--- /dev/null
+++ binaries/data/mods/public/globalscripts/Formation.js
@@ -0,0 +1,4 @@
+/**
+ * The 'null' formation means that units are individuals.
+ */
+const NULL_FORMATION = "special/formations/null";
Index: binaries/data/mods/public/gui/session/AutoFormation.js
===================================================================
--- /dev/null
+++ binaries/data/mods/public/gui/session/AutoFormation.js
@@ -0,0 +1,59 @@
+/**
+ * Handles the logic related to the 'default formation' feature.
+ * When given a walking order, units that aren't in formation will be put
+ * in the default formation, to improve pathfinding and reactivity.
+ * However, when given other tasks (such as e.g. gather), they will be removed
+ * from any formation they are in, as those orders don't work very well with formations.
+ *
+ * Set the default formation to the null formation to disable this entirely.
+ *
+ * TODO: it would be nice to let players choose default formations for different orders,
+ * but that would be neater if orders where defined somewhere unique,
+ * instead of mostly in unit_actions.js
+ */
+class AutoFormation
+{
+	constructor()
+	{
+		this.defaultFormation = Engine.ConfigDB_GetValue("user", "gui.session.defaultformation");
+		if (!this.defaultFormation)
+			this.setDefault(NULL_FORMATION);
+	}
+
+	/**
+	 * Set the default formation to @param formation.
+	 * TODO: would be good to validate, particularly since some formations aren't
+	 * usable with any arbitrary unit type, we may want to warn then.
+	 */
+	setDefault(formation)
+	{
+		this.defaultFormation = formation;
+		Engine.ConfigDB_CreateValue("user", "gui.session.defaultformation", this.defaultFormation);
+		// TODO: It's extremely terrible that we have to explicitly flush the config...
+		Engine.ConfigDB_SetChanges("user", true);
+		Engine.ConfigDB_WriteFile("user", "config/user.cfg");
+		return true;
+	}
+
+	isDefault(formation)
+	{
+		return formation == this.defaultFormation;
+	}
+
+	/**
+	 * @return the default formation, or "undefined" if the null formation was chosen,
+	 * otherwise units in formation would disband on any order, which isn't desirable.
+	 */
+	getDefault()
+	{
+		return this.defaultFormation == NULL_FORMATION ? undefined : this.defaultFormation;
+	}
+
+	/**
+	 * @return the null formation, or "undefined" if the null formation is the default.
+	 */
+	getNull()
+	{
+		return this.defaultFormation == NULL_FORMATION ? undefined : NULL_FORMATION;
+	}
+}
Index: binaries/data/mods/public/gui/session/selection_panels.js
===================================================================
--- binaries/data/mods/public/gui/session/selection_panels.js
+++ binaries/data/mods/public/gui/session/selection_panels.js
@@ -309,7 +309,7 @@
 		if (!g_FormationsInfo.has(data.item))
 			g_FormationsInfo.set(data.item, Engine.GuiInterfaceCall("GetFormationInfoFromTemplate", { "templateName": data.item }));
 
-		let formationOk = data.item == "special/formations/null" || canMoveSelectionIntoFormation(data.item);
+		let formationOk = canMoveSelectionIntoFormation(data.item);
 		let unitIds = data.unitEntStates.map(state => state.id);
 		let formationSelected = Engine.GuiInterfaceCall("IsFormationSelected", {
 			"ents": unitIds,
@@ -320,8 +320,21 @@
 			performFormation(unitIds, data.item);
 		};
 
+		data.button.onMouseRightPress = () => g_AutoFormation.setDefault(data.item);
+
 		let formationInfo = g_FormationsInfo.get(data.item);
 		let tooltip = translate(formationInfo.name);
+
+		let isDefaultFormation = g_AutoFormation.isDefault(data.item);
+		if (data.item === NULL_FORMATION)
+			tooltip += "\n" + (isDefaultFormation ?
+				translate("Default formation is disabled.") :
+				translate("Right-click to disable the default formation feature."));
+		else
+			tooltip += "\n" + (isDefaultFormation ?
+				translate("This is the default formation, used for movement orders.") :
+				translate("Right-click to set this as the default formation."));
+
 		if (!formationOk && formationInfo.tooltip)
 			tooltip += "\n" + coloredText(translate(formationInfo.tooltip), "red");
 		data.button.tooltip = tooltip;
@@ -329,6 +342,7 @@
 		data.button.enabled = formationOk && controlsPlayer(data.player);
 		let grayscale = formationOk ? "" : "grayscale:";
 		data.guiSelection.hidden = !formationSelected;
+		data.countDisplay.hidden = !isDefaultFormation;
 		data.icon.sprite = "stretched:" + grayscale + "session/icons/" + formationInfo.icon;
 
 		setPanelObjectPosition(data.button, data.i, data.rowLength);
Index: binaries/data/mods/public/gui/session/selection_panels_helpers.js
===================================================================
--- binaries/data/mods/public/gui/session/selection_panels_helpers.js
+++ binaries/data/mods/public/gui/session/selection_panels_helpers.js
@@ -8,6 +8,8 @@
 
 function canMoveSelectionIntoFormation(formationTemplate)
 {
+	if (formationTemplate == NULL_FORMATION)
+		return true;
 	if (!(formationTemplate in g_canMoveIntoFormation))
 		g_canMoveIntoFormation[formationTemplate] = Engine.GuiInterfaceCall("CanMoveEntsIntoFormation", {
 			"ents": g_Selection.toList(),
@@ -272,7 +274,7 @@
 	Engine.PostNetworkCommand({
 		"type": "formation",
 		"entities": entities,
-		"name": formationTemplate
+		"formation": formationTemplate
 	});
 }
 
Index: binaries/data/mods/public/gui/session/selection_panels_left/formation_panel.xml
===================================================================
--- binaries/data/mods/public/gui/session/selection_panels_left/formation_panel.xml
+++ binaries/data/mods/public/gui/session/selection_panels_left/formation_panel.xml
@@ -7,6 +7,7 @@
 			<object name="unitFormationButton[n]" hidden="true" style="iconButton" type="button" size="0 0 38 38" tooltip_style="sessionToolTipBottomBold" z="100">
 				<object name="unitFormationIcon[n]" type="image" ghost="true" size="3 3 35 35"/>
 				<object name="unitFormationSelection[n]" hidden="true" type="image" ghost="true" size="3 3 35 35" sprite="stretched:session/icons/corners.png"/>
+				<object name="unitFormationCount[n]" hidden="true" type="image" ghost="true" size="3 3 35 35" sprite="stretched:session/icons/upgrade.png"/>
 			</object>
 		</repeat>
 	</object>
Index: binaries/data/mods/public/gui/session/session.js
===================================================================
--- binaries/data/mods/public/gui/session/session.js
+++ binaries/data/mods/public/gui/session/session.js
@@ -10,6 +10,7 @@
 const g_VictoryConditions = g_Settings && g_Settings.VictoryConditions;
 
 var g_Ambient;
+var g_AutoFormation;
 var g_Chat;
 var g_Cheats;
 var g_DeveloperOverlay;
@@ -277,6 +278,7 @@
 	g_PlayerViewControl.registerViewedPlayerChangeHandler(resetTemplates);
 
 	g_Ambient = new Ambient();
+	g_AutoFormation = new AutoFormation();
 	g_Chat = new Chat(g_PlayerViewControl, g_Cheats);
 	g_DeveloperOverlay = new DeveloperOverlay(g_PlayerViewControl, g_Selection);
 	g_DiplomacyDialog = new DiplomacyDialog(g_PlayerViewControl, g_DiplomacyColors);
Index: binaries/data/mods/public/gui/session/unit_actions.js
===================================================================
--- binaries/data/mods/public/gui/session/unit_actions.js
+++ binaries/data/mods/public/gui/session/unit_actions.js
@@ -52,7 +52,8 @@
 				"entities": selection,
 				"x": target.x,
 				"z": target.z,
-				"queued": queued
+				"queued": queued,
+				"formation": g_AutoFormation.getDefault()
 			});
 
 			DrawTargetMarker(target);
@@ -103,7 +104,8 @@
 				"x": target.x,
 				"z": target.z,
 				"targetClasses": targetClasses,
-				"queued": queued
+				"queued": queued,
+				"formation": g_AutoFormation.getDefault()
 			});
 
 			DrawTargetMarker(target);
@@ -143,7 +145,8 @@
 				"entities": selection,
 				"target": action.target,
 				"allowCapture": true,
-				"queued": queued
+				"queued": queued,
+				"formation": g_AutoFormation.getDefault()
 			});
 
 			Engine.GuiInterfaceCall("PlaySound", {
@@ -189,7 +192,8 @@
 				"entities": selection,
 				"target": action.target,
 				"queued": queued,
-				"allowCapture": false
+				"allowCapture": false,
+				"formation": g_AutoFormation.getDefault()
 			});
 
 			Engine.GuiInterfaceCall("PlaySound", {
@@ -250,7 +254,8 @@
 				"target": action.target,
 				"targetClasses": { "attack": g_PatrolTargets },
 				"queued": queued,
-				"allowCapture": false
+				"allowCapture": false,
+				"formation": g_AutoFormation.getDefault()
 			});
 
 			DrawTargetMarker(target);
@@ -298,7 +303,8 @@
 				"type": "heal",
 				"entities": selection,
 				"target": action.target,
-				"queued": queued
+				"queued": queued,
+				"formation": g_AutoFormation.getNull()
 			});
 
 			Engine.GuiInterfaceCall("PlaySound", {
@@ -364,7 +370,8 @@
 				"entities": selection,
 				"target": action.target,
 				"autocontinue": true,
-				"queued": queued
+				"queued": queued,
+				"formation": g_AutoFormation.getNull()
 			});
 
 			Engine.GuiInterfaceCall("PlaySound", {
@@ -444,7 +451,8 @@
 				"type": "gather",
 				"entities": selection,
 				"target": action.target,
-				"queued": queued
+				"queued": queued,
+				"formation": g_AutoFormation.getNull()
 			});
 
 			Engine.GuiInterfaceCall("PlaySound", {
@@ -492,7 +500,8 @@
 				"type": "returnresource",
 				"entities": selection,
 				"target": action.target,
-				"queued": queued
+				"queued": queued,
+				"formation": g_AutoFormation.getNull()
 			});
 
 			Engine.GuiInterfaceCall("PlaySound", {
@@ -605,7 +614,8 @@
 				"target": action.target,
 				"source": null,
 				"route": null,
-				"queued": queued
+				"queued": queued,
+				"formation": g_AutoFormation.getNull()
 			});
 
 			Engine.GuiInterfaceCall("PlaySound", {
@@ -708,7 +718,8 @@
 				"type": "garrison",
 				"entities": selection,
 				"target": action.target,
-				"queued": queued
+				"queued": queued,
+				"formation": g_AutoFormation.getNull()
 			});
 
 			Engine.GuiInterfaceCall("PlaySound", {
@@ -789,7 +800,8 @@
 				"type": "guard",
 				"entities": selection,
 				"target": action.target,
-				"queued": queued
+				"queued": queued,
+				"formation": g_AutoFormation.getDefault()
 			});
 
 			Engine.GuiInterfaceCall("PlaySound", {
Index: binaries/data/mods/public/simulation/components/UnitAI.js
===================================================================
--- binaries/data/mods/public/simulation/components/UnitAI.js
+++ binaries/data/mods/public/simulation/components/UnitAI.js
@@ -247,7 +247,23 @@
 	},
 
 	// Individual orders:
-	// (these will switch the unit out of formation mode)
+
+	"Order.LeaveFormation": function() {
+		if (!this.IsFormationMember())
+		{
+			this.FinishOrder();
+			return;
+		}
+
+		let cmpFormation = Engine.QueryInterface(this.formationController, IID_Formation);
+		if (cmpFormation)
+		{
+			cmpFormation.SetRearrange(false);
+			// Calls FinishOrder();
+			cmpFormation.RemoveMembers([this.entity]);
+			cmpFormation.SetRearrange(true);
+		}
+	},
 
 	"Order.Stop": function(msg) {
 		this.StopMoving();
@@ -5098,6 +5114,20 @@
 
 //// External interface functions ////
 
+/**
+ * Order a unit to leave the formation it is in.
+ * Used to handle queued no-formation orders for units in formation.
+ */
+UnitAI.prototype.LeaveFormation = function(queued = true)
+{
+	// If queued, add the order even if we're not in formation,
+	// maybe we will be later.
+	if (!queued && !this.IsFormationMember())
+		return;
+
+	this.AddOrder("LeaveFormation", {}, queued);
+};
+
 UnitAI.prototype.SetFormationController = function(ent)
 {
 	this.formationController = ent;
@@ -5125,7 +5155,7 @@
 
 UnitAI.prototype.GetFormationTemplate = function()
 {
-	return Engine.QueryInterface(SYSTEM_ENTITY, IID_TemplateManager).GetCurrentTemplateName(this.formationController) || "special/formations/null";
+	return Engine.QueryInterface(SYSTEM_ENTITY, IID_TemplateManager).GetCurrentTemplateName(this.formationController) || NULL_FORMATION;
 };
 
 UnitAI.prototype.MoveIntoFormation = function(cmd)
Index: binaries/data/mods/public/simulation/helpers/Commands.js
===================================================================
--- binaries/data/mods/public/simulation/helpers/Commands.js
+++ binaries/data/mods/public/simulation/helpers/Commands.js
@@ -16,6 +16,12 @@
 	if (cmd.entities)
 		data.entities = FilterEntityList(cmd.entities, player, data.controlAllUnits);
 
+	// TODO: queuing order and forcing formations doesn't really work.
+	// To play nice, we'll still no-formation queued order if units are in formation
+	// but the opposite perhaps ought to be implemented.
+	if (!cmd.queued || cmd.formation == NULL_FORMATION)
+		data.formation = cmd.formation || undefined;
+
 	// Allow focusing the camera on recent commands
 	let commandData = {
 		"type": "playercommand",
@@ -137,7 +143,7 @@
 
 	"walk": function(player, cmd, data)
 	{
-		GetFormationUnitAIs(data.entities, player).forEach(cmpUnitAI => {
+		GetFormationUnitAIs(data.entities, player, data.formation).forEach(cmpUnitAI => {
 			cmpUnitAI.Walk(cmd.x, cmd.z, cmd.queued);
 		});
 	},
@@ -145,7 +151,7 @@
 	"walk-custom": function(player, cmd, data)
 	{
 		for (let ent in data.entities)
-			GetFormationUnitAIs([data.entities[ent]], player).forEach(cmpUnitAI => {
+			GetFormationUnitAIs([data.entities[ent]], player, data.formation).forEach(cmpUnitAI => {
 				cmpUnitAI.Walk(cmd.targetPositions[ent].x, cmd.targetPositions[ent].y, cmd.queued);
 			});
 	},
@@ -165,7 +171,7 @@
 	{
 		let allowCapture = cmd.allowCapture || cmd.allowCapture == null;
 
-		GetFormationUnitAIs(data.entities, player).forEach(cmpUnitAI => {
+		GetFormationUnitAIs(data.entities, player, data.formation).forEach(cmpUnitAI => {
 			cmpUnitAI.WalkAndFight(cmd.x, cmd.z, cmd.targetClasses, allowCapture, cmd.queued);
 		});
 	},
@@ -187,7 +193,7 @@
 		   !(IsOwnedByEnemyOfPlayer(player, cmd.target) || IsOwnedByNeutralOfPlayer(player, cmd.target)))
 			warn("Invalid command: attack target is not owned by enemy of player "+player+": "+uneval(cmd));
 
-		GetFormationUnitAIs(data.entities, player).forEach(cmpUnitAI => {
+		GetFormationUnitAIs(data.entities, player, data.formation).forEach(cmpUnitAI => {
 			cmpUnitAI.Attack(cmd.target, allowCapture, cmd.queued);
 		});
 	},
@@ -196,7 +202,7 @@
 	{
 		let allowCapture = cmd.allowCapture || cmd.allowCapture == null;
 
-		GetFormationUnitAIs(data.entities, player).forEach(cmpUnitAI =>
+		GetFormationUnitAIs(data.entities, player, data.formation).forEach(cmpUnitAI =>
 			cmpUnitAI.Patrol(cmd.x, cmd.z, cmd.targetClasses, allowCapture, cmd.queued)
 		);
 	},
@@ -206,7 +212,7 @@
 		if (g_DebugCommands && !(IsOwnedByPlayer(player, cmd.target) || IsOwnedByAllyOfPlayer(player, cmd.target)))
 			warn("Invalid command: heal target is not owned by player "+player+" or their ally: "+uneval(cmd));
 
-		GetFormationUnitAIs(data.entities, player).forEach(cmpUnitAI => {
+		GetFormationUnitAIs(data.entities, player, data.formation).forEach(cmpUnitAI => {
 			cmpUnitAI.Heal(cmd.target, cmd.queued);
 		});
 	},
@@ -217,7 +223,7 @@
 		if (g_DebugCommands && !IsOwnedByAllyOfPlayer(player, cmd.target))
 			warn("Invalid command: repair target is not owned by ally of player "+player+": "+uneval(cmd));
 
-		GetFormationUnitAIs(data.entities, player).forEach(cmpUnitAI => {
+		GetFormationUnitAIs(data.entities, player, data.formation).forEach(cmpUnitAI => {
 			cmpUnitAI.Repair(cmd.target, cmd.autocontinue, cmd.queued);
 		});
 	},
@@ -227,14 +233,14 @@
 		if (g_DebugCommands && !(IsOwnedByPlayer(player, cmd.target) || IsOwnedByGaia(cmd.target)))
 			warn("Invalid command: resource is not owned by gaia or player "+player+": "+uneval(cmd));
 
-		GetFormationUnitAIs(data.entities, player).forEach(cmpUnitAI => {
+		GetFormationUnitAIs(data.entities, player, data.formation).forEach(cmpUnitAI => {
 			cmpUnitAI.Gather(cmd.target, cmd.queued);
 		});
 	},
 
 	"gather-near-position": function(player, cmd, data)
 	{
-		GetFormationUnitAIs(data.entities, player).forEach(cmpUnitAI => {
+		GetFormationUnitAIs(data.entities, player, data.formation).forEach(cmpUnitAI => {
 			cmpUnitAI.GatherNearPosition(cmd.x, cmd.z, cmd.resourceType, cmd.resourceTemplate, cmd.queued);
 		});
 	},
@@ -244,7 +250,7 @@
 		if (g_DebugCommands && !IsOwnedByPlayer(player, cmd.target))
 			warn("Invalid command: dropsite is not owned by player "+player+": "+uneval(cmd));
 
-		GetFormationUnitAIs(data.entities, player).forEach(cmpUnitAI => {
+		GetFormationUnitAIs(data.entities, player, data.formation).forEach(cmpUnitAI => {
 			cmpUnitAI.ReturnResource(cmd.target, cmd.queued);
 		});
 	},
@@ -451,7 +457,7 @@
 			return;
 		}
 
-		GetFormationUnitAIs(data.entities, player).forEach(cmpUnitAI => {
+		GetFormationUnitAIs(data.entities, player, data.formation).forEach(cmpUnitAI => {
 			cmpUnitAI.Garrison(cmd.target, cmd.queued);
 		});
 	},
@@ -465,14 +471,14 @@
 			return;
 		}
 
-		GetFormationUnitAIs(data.entities, player).forEach(cmpUnitAI => {
+		GetFormationUnitAIs(data.entities, player, data.formation).forEach(cmpUnitAI => {
 			cmpUnitAI.Guard(cmd.target, cmd.queued);
 		});
 	},
 
 	"stop": function(player, cmd, data)
 	{
-		GetFormationUnitAIs(data.entities, player).forEach(cmpUnitAI => {
+		GetFormationUnitAIs(data.entities, player, data.formation).forEach(cmpUnitAI => {
 			cmpUnitAI.Stop(cmd.queued);
 		});
 	},
@@ -564,7 +570,7 @@
 
 	"formation": function(player, cmd, data)
 	{
-		GetFormationUnitAIs(data.entities, player, cmd.name).forEach(cmpUnitAI => {
+		GetFormationUnitAIs(data.entities, player, data.formation, true).forEach(cmpUnitAI => {
 			cmpUnitAI.MoveIntoFormation(cmd);
 		});
 	},
@@ -617,14 +623,14 @@
 
 	"setup-trade-route": function(player, cmd, data)
 	{
-		GetFormationUnitAIs(data.entities, player).forEach(cmpUnitAI => {
+		GetFormationUnitAIs(data.entities, player, data.formation).forEach(cmpUnitAI => {
 			cmpUnitAI.SetupTradeRoute(cmd.target, cmd.source, cmd.route, cmd.queued);
 		});
 	},
 
 	"cancel-setup-trade-route": function(player, cmd, data)
 	{
-		GetFormationUnitAIs(data.entities, player).forEach(cmpUnitAI => {
+		GetFormationUnitAIs(data.entities, player, data.formation).forEach(cmpUnitAI => {
 			cmpUnitAI.CancelSetupTradeRoute(cmd.target);
 		});
 	},
@@ -885,8 +891,9 @@
  */
 function ExtractFormations(ents)
 {
-	var entities = []; // subset of ents that have UnitAI
-	var members = {}; // { formationentity: [ent, ent, ...], ... }
+	let entities = []; // subset of ents that have UnitAI
+	let members = {}; // { formationentity: [ent, ent, ...], ... }
+	let templates = {};  // { formationentity: template }
 	for (let ent of ents)
 	{
 		var cmpUnitAI = Engine.QueryInterface(ent, IID_UnitAI);
@@ -894,13 +901,16 @@
 		if (fid != INVALID_ENTITY)
 		{
 			if (!members[fid])
+			{
 				members[fid] = [];
+				templates[fid] = cmpUnitAI.GetFormationTemplate();
+			}
 			members[fid].push(ent);
 		}
 		entities.push(ent);
 	}
 
-	return { "entities": entities, "members": members };
+	return { "entities": entities, "members": members, "templates": templates };
 }
 
 /**
@@ -1421,7 +1431,7 @@
  * Returns a list of UnitAI components, each belonging either to a
  * selected unit or to a formation entity for groups of the selected units.
  */
-function GetFormationUnitAIs(ents, player, formationTemplate)
+function GetFormationUnitAIs(ents, player, formationTemplate, forceTemplate)
 {
 	// If an individual was selected, remove it from any formation
 	// and command it individually
@@ -1452,13 +1462,15 @@
 		// TODO: We only check if the formation is usable by some units
 		// if we move them to it. We should check if we can use formations
 		// for the other cases.
-		var nullFormation = (formationTemplate || cmpUnitAI.GetFormationTemplate()) == "special/formations/null";
-		if (!nullFormation && cmpIdentity && cmpIdentity.CanUseFormation(formationTemplate || "special/formations/null"))
+		var nullFormation = (formationTemplate || cmpUnitAI.GetFormationTemplate()) == NULL_FORMATION;
+		if (!nullFormation && cmpIdentity && cmpIdentity.CanUseFormation(formationTemplate || NULL_FORMATION))
 			formedEnts.push(ent);
 		else
 		{
-			if (nullFormation)
-				RemoveFromFormation([ent]);
+			// Remove entities from the formation if necessary.
+			// This is done using an order to support queued orders (see TODO above).
+			if (nullFormation && cmpUnitAI.GetFormationController())
+				cmpUnitAI.LeaveFormation();
 
 			nonformedUnitAIs.push(cmpUnitAI);
 		}
@@ -1481,16 +1493,33 @@
 		// Check that all its members are selected
 		var fid = formationIds[0];
 		var cmpFormation = Engine.QueryInterface(+fid, IID_Formation);
-		if (cmpFormation && cmpFormation.GetMemberCount() == formation.members[fid].length
-			&& cmpFormation.GetMemberCount() == formation.entities.length)
+		if (cmpFormation && cmpFormation.GetMemberCount() == formation.members[fid].length &&
+		    cmpFormation.GetMemberCount() == formation.entities.length)
 		{
-			cmpFormation.DeleteTwinFormations();
 			// The whole formation was selected, so reuse its controller for this command
-			formationUnitAIs = [Engine.QueryInterface(+fid, IID_UnitAI)];
-			if (formationTemplate && CanMoveEntsIntoFormation(formation.entities, formationTemplate))
-				cmpFormation.LoadFormation(formationTemplate);
+			if (!forceTemplate)
+				formationTemplate = formation.templates[fid];
+
+			if (formationTemplate == formation.templates[fid])
+			{
+				cmpFormation.DeleteTwinFormations();
+				formationUnitAIs = [Engine.QueryInterface(+fid, IID_UnitAI)];
+			}
 		}
 	}
+	else if (!forceTemplate && formationIds.length)
+	{
+		// Check if all entities share a common formation, if so reuse this template.
+		let template = formation.templates[formationIds[0]];
+		for (let i = 1; i < formationIds.length; ++i)
+			if (formation.templates[formationIds[i]] != template)
+			{
+				template = null;
+				break;
+			}
+		if (template)
+			formationTemplate = template;
+	}
 
 	if (!formationUnitAIs.length)
 	{
@@ -1502,36 +1531,9 @@
 		var formationEnts = [];
 		for (let cluster of clusters)
 		{
-			if (!formationTemplate || !CanMoveEntsIntoFormation(cluster, formationTemplate))
-			{
-				// Use the last formation template if everyone was using it
-				var lastFormationTemplate = undefined;
-				for (let ent of cluster)
-				{
-					var cmpUnitAI = Engine.QueryInterface(ent, IID_UnitAI);
-					if (cmpUnitAI)
-					{
-						var template = cmpUnitAI.GetFormationTemplate();
-						if (lastFormationTemplate === undefined)
-						{
-							lastFormationTemplate = template;
-						}
-						else if (lastFormationTemplate != template)
-						{
-							lastFormationTemplate = undefined;
-							break;
-						}
-					}
-				}
-				if (lastFormationTemplate && CanMoveEntsIntoFormation(cluster, lastFormationTemplate))
-					formationTemplate = lastFormationTemplate;
-				else
-					formationTemplate = "special/formations/null";
-			}
-
 			RemoveFromFormation(cluster);
 
-			if (formationTemplate == "special/formations/null")
+			if (!formationTemplate || !CanMoveEntsIntoFormation(cluster, formationTemplate))
 			{
 				for (let ent of cluster)
 					nonformedUnitAIs.push(Engine.QueryInterface(ent, IID_UnitAI));