diff --git a/ASM/beta/VersionFeed.xml b/ASM/beta/VersionFeed.xml
index 2a9d331b..4ccf938d 100644
--- a/ASM/beta/VersionFeed.xml
+++ b/ASM/beta/VersionFeed.xml
@@ -5,28 +5,32 @@
   <title>Ark Server Manager Version Feed</title>
   <subtitle>This is the Ark Server Manager beta version feed.</subtitle>
   <link href="http://arkservermanager.freeforums.net/" />
-  <updated>2021-06-06T00:00:00Z</updated>
+  <updated>2021-06-06T12:00:00Z</updated>
 
   <entry>
-    <id>urn:uuid:B30DEF07-7124-4112-BCFD-569BC9BBB542</id>
-    <title>1.1.395 (1.1.395.1)</title>
-    <summary>1.1.395.1</summary>
+    <id>urn:uuid:BEE448E4-A070-4D5E-A7C4-463230433448</id>
+    <title>1.1.396 (1.1.396.1)</title>
+    <summary>1.1.396.1</summary>
     <link href="" />
-    <updated>2021-06-06T00:00:00Z</updated>
+    <updated>2021-06-06T12:00:00Z</updated>
     <content type="xhtml">
       <div xmlns="http://www.w3.org/1999/xhtml" style="font-family: Arial, Verdana, Helvetica, Sans-Serif;font-size: .8em;">
         <p>
+          <u style="font-size: .9em;">BUGFIX</u>
+          <br/>
+          <ul>
+            <li>Fixed a crashing issue when some of the integer entry boxes were cleared of the value.</li>
+          </ul>
           <u style="font-size: .9em;">NEW</u>
           <br/>
           <ul>
-            <li>Server Settings - Dino Section - Added the AllowFlyerSpeedLeveling setting.</li>
-            <li>Server Settings - Rules Section - Added new Genesis: Part 2 section.</li>
-            <li>Server Settings - Rules Section - Expanded Hexegon section with new settings.</li>
+            <li>Server Settings - Rules Section - Added ItemStatClamps settings.</li>
           </ul>
           <u style="font-size: .9em;">CHANGE</u>
           <br/>
           <ul>
-            <li>Player Levels - Added the new 25 player levels introduced in the Genesis: Part 2 DLC.</li>
+            <li>Settings Grids - Added coloring for Genesis: Part 2 resources, engrams and dinos.</li>
+            <li>Server Update - After server update, added check for version.txt file to read the new version.</li>
           </ul>
         </p>
       </div>
diff --git a/ASM/beta/en-US.xaml b/ASM/beta/en-US.xaml
index 426d3216..f1d31a99 100644
--- a/ASM/beta/en-US.xaml
+++ b/ASM/beta/en-US.xaml
@@ -1310,6 +1310,17 @@
     <sys:String x:Key="ServerSettings_CryopodNerfDamageMultiplierTooltip">Specifies the multiplier for damage done by creatures, after they have been released from a cryopod. Lower values means the damage done by the creature will be lower (eg. 0.01 means 99% of the damage is removed).</sys:String>
     <sys:String x:Key="ServerSettings_CryopodNerfIncomingDamageMultPercentLabel">Incoming Damage Multiplier Percent</sys:String>
     <sys:String x:Key="ServerSettings_CryopodNerfIncomingDamageMultPercentTooltip">Specifies the percentage increase to the incoming damage multiplier of a creature, after they have been released from a cryopod. Higher values means more incoming damage done to the creature (eg. 0.25 = 25% more damage).</sys:String>
+
+    <sys:String x:Key="ServerSettings_ItemStatClampsLabel">Item Stat Clamps</sys:String>
+    <sys:String x:Key="ServerSettings_ItemStatClampsNoteLabel">WARNING: This will permanently change the stats of any existing items so make sure to backup your current save before modifying and playing with the clamping values.</sys:String>
+    <sys:String x:Key="ServerSettings_ItemStatClamps_GenericQualityLabel">Generic Quality</sys:String>
+    <sys:String x:Key="ServerSettings_ItemStatClamps_ArmorLabel">Armor</sys:String>
+    <sys:String x:Key="ServerSettings_ItemStatClamps_MaxDurabilityLabel">Max Durability</sys:String>
+    <sys:String x:Key="ServerSettings_ItemStatClamps_WeaponDamagePercentLabel">Weapon Damage Percent</sys:String>
+    <sys:String x:Key="ServerSettings_ItemStatClamps_WeaponClipAmmoLabel">Weapon Clip Ammo</sys:String>
+    <sys:String x:Key="ServerSettings_ItemStatClamps_HypothermalInsulationLabel">Hypo Insulation</sys:String>
+    <sys:String x:Key="ServerSettings_ItemStatClamps_WeightLabel">Weight</sys:String>
+    <sys:String x:Key="ServerSettings_ItemStatClamps_HyperthermalInsulationLabel">Hyper Insulation</sys:String>
     <!--#endregion-->
 
     <!--#region Server Settings - Chat and Notifications -->
diff --git a/ASM/beta/latest.txt b/ASM/beta/latest.txt
index 5834849f..93599d3d 100644
--- a/ASM/beta/latest.txt
+++ b/ASM/beta/latest.txt
@@ -1 +1 @@
-1.1.395.1
+1.1.396.1
diff --git a/ASM/beta/latest.zip b/ASM/beta/latest.zip
index 41732b86..8685bca1 100644
Binary files a/ASM/beta/latest.zip and b/ASM/beta/latest.zip differ
diff --git a/src/ARKServerManager/ARKServerManager.csproj b/src/ARKServerManager/ARKServerManager.csproj
index 2c1be8fe..d2da848a 100644
--- a/src/ARKServerManager/ARKServerManager.csproj
+++ b/src/ARKServerManager/ARKServerManager.csproj
@@ -36,7 +36,7 @@
     <PublisherName>Bletch1971</PublisherName>
     <SuiteName>Server Managers</SuiteName>
     <OpenBrowserOnPublish>false</OpenBrowserOnPublish>
-    <ApplicationRevision>1</ApplicationRevision>
+    <ApplicationRevision>2</ApplicationRevision>
     <ApplicationVersion>1.1.396.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <PublishWizardCompleted>true</PublishWizardCompleted>