diff --git a/GameVersion.cpp b/GameVersion.cpp
index c5792c1e..ca36219e 100644
--- a/GameVersion.cpp
+++ b/GameVersion.cpp
@@ -55,8 +55,8 @@
 
 #endif
 										
-CHAR8		czVersionNumber[16]	= { "Build 20.06.25" };		//YY.MM.DD
+CHAR8		czVersionNumber[16]	= { "Build 20.07.17" };		//YY.MM.DD
 CHAR16		zTrackingNumber[16]	= { L"Z" };
-CHAR16		zRevisionNumber[16] = { L"Revision 8828" };
+CHAR16		zRevisionNumber[16] = { L"Revision 8868" };
 	
 // SAVE_GAME_VERSION is defined in header, change it there
diff --git a/Strategic/Assignments.cpp b/Strategic/Assignments.cpp
index c6204d87..dd49db9c 100644
--- a/Strategic/Assignments.cpp
+++ b/Strategic/Assignments.cpp
@@ -14422,10 +14422,12 @@ void CreateSquadBox( void )
  GetBoxPosition( ghSquadBox, &pPoint);
  GetBoxSize( ghSquadBox, &pDimensions );
 
- if( giBoxY + pDimensions.iBottom > 479 )
+	// silversurfer: This doesn't make sense. Even at 800x600 the squad box can be displayed without this adjustment.
+	// The adjustment causes issues when USE_XML_SQUADNAMES is TRUE, because it will move the squad box up over the column header, which looks bad and causes clipping issues. Disabled.
+ /*if( giBoxY + pDimensions.iBottom > 479 )
  {
 		pPoint.iY = SquadPosition.iY = 479 - pDimensions.iBottom;
-	}
+	}*/
 
 	SetBoxPosition( ghSquadBox, pPoint );
 }
diff --git a/Tactical/Soldier Profile.cpp b/Tactical/Soldier Profile.cpp
index fdde2bdc..cdfff67e 100644
--- a/Tactical/Soldier Profile.cpp	
+++ b/Tactical/Soldier Profile.cpp	
@@ -687,11 +687,12 @@ BOOLEAN LoadMercProfiles(void)
 		gMercProfiles[uiLoop].sPreCombatGridNo = gMercProfiles[uiLoop]._old_sGridNo;
 		//</SB>
 
-		/* CHRISL: For now, we should only overwrite prof.dat in the new inventory system.  Old system should still use
+		/* silversurfer: READ_PROFILE_DATA_FROM_XML from JA2.Options.ini should always take precedence.
+		CHRISL: For now, we should only overwrite prof.dat in the new inventory system.  Old system should still use
 		prof.dat until we're sure we want to replace it with the xml file.
 			Because the new WF mercs don't have entries in the prof*.dat files, we need to always load their equipment from
 			MercStaringGear.xml, regardless of the inventory system we're going to use.*/
-		if(UsingNewInventorySystem() == true || uiLoop >= 170 )
+		if( gGameExternalOptions.fReadProfileDataFromXML || UsingNewInventorySystem() == true || uiLoop >= 170 )
 		{
 			// Start by resetting all profile inventory values to 0
 			gMercProfiles[uiLoop].clearInventory();