diff --git a/ASM/ArkServerManager_1.1.396.exe b/ASM/ArkServerManager_1.1.396.exe
new file mode 100644
index 00000000..01f6844b
Binary files /dev/null and b/ASM/ArkServerManager_1.1.396.exe differ
diff --git a/ASM/ArkServerManager_1.1.396.zip b/ASM/ArkServerManager_1.1.396.zip
new file mode 100644
index 00000000..8685bca1
Binary files /dev/null and b/ASM/ArkServerManager_1.1.396.zip differ
diff --git a/ASM/VersionFeed.xml b/ASM/VersionFeed.xml
index e4641685..36668159 100644
--- a/ASM/VersionFeed.xml
+++ b/ASM/VersionFeed.xml
@@ -5,7 +5,41 @@
   <title>Ark Server Manager Version Feed</title>
   <subtitle>This is the Ark Server Manager release 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: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-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 - Rules Section - Added ItemStatClamps settings.</li>
+          </ul>
+          <u style="font-size: .9em;">CHANGE</u>
+          <br/>
+          <ul>
+            <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>
+    </content>
+    <author>
+      <name>bletch</name>
+      <email>bletch1971@hotmail.com</email>
+    </author>
+  </entry>
 
   <entry>
     <id>urn:uuid:B30DEF07-7124-4112-BCFD-569BC9BBB542</id>
diff --git a/ASM/en-US.xaml b/ASM/en-US.xaml
index 426d3216..f1d31a99 100644
--- a/ASM/en-US.xaml
+++ b/ASM/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/latest.exe b/ASM/latest.exe
index a042d821..01f6844b 100644
Binary files a/ASM/latest.exe and b/ASM/latest.exe differ
diff --git a/ASM/latest.txt b/ASM/latest.txt
index 336f1062..a732141f 100644
--- a/ASM/latest.txt
+++ b/ASM/latest.txt
@@ -1 +1 @@
-1.1.395
+1.1.396
diff --git a/ASM/latest.zip b/ASM/latest.zip
index 41732b86..8685bca1 100644
Binary files a/ASM/latest.zip and b/ASM/latest.zip differ