diff --git a/Client.Config/Config.xml b/Client.Config/Config.xml
index 748c96c4..233d4f8f 100644
--- a/Client.Config/Config.xml
+++ b/Client.Config/Config.xml
@@ -6,7 +6,7 @@
       <RenderingMethod>GPU</RenderingMethod> <!-- GPU/CPU -->
       <ShowVirtualKeyboard>false</ShowVirtualKeyboard>
       <RunningOnSecondaryScreen>false</RunningOnSecondaryScreen>
-      <DeveloperMode>true</DeveloperMode>
+      <DeveloperMode>false</DeveloperMode>
   </Client>
   <Connection>
       <ServerUrl>localhost</ServerUrl>
diff --git a/Libs/CMS_CORE_Library.dll b/Libs/CMS_CORE_Library.dll
index 52db11c7..30924a88 100644
Binary files a/Libs/CMS_CORE_Library.dll and b/Libs/CMS_CORE_Library.dll differ
diff --git a/Step.Config/Config/serverConfig.xml b/Step.Config/Config/serverConfig.xml
index 0a29d13c..899c45be 100644
--- a/Step.Config/Config/serverConfig.xml
+++ b/Step.Config/Config/serverConfig.xml
@@ -10,7 +10,7 @@
     <sharedName>//PARTPRG:/</sharedName>
     <installationDate>01/01/2019</installationDate>
     <mgiOption>false</mgiOption>
-    <siemensKeyboardOption>true</siemensKeyboardOption>
+    <siemensKeyboardOption>false</siemensKeyboardOption>
   </ncConfig>
   <softwareProdConfig>
     <enabled>false</enabled>
diff --git a/Step.Config/Config/toolManagerConfig.xml b/Step.Config/Config/toolManagerConfig.xml
index 8820ae18..16c8352e 100644
--- a/Step.Config/Config/toolManagerConfig.xml
+++ b/Step.Config/Config/toolManagerConfig.xml
@@ -15,6 +15,7 @@
     <selfAdaptivePathOpt>true</selfAdaptivePathOpt>
     <dynamicCompensationOpt>true</dynamicCompensationOpt>
     <ballufOpt>true</ballufOpt>
+    <integrityCheckOpt>true</integrityCheckOpt>
   </toolManagerConfig>
   <coolingLocalizedNames>
     <cooling>
diff --git a/Step.Config/Config/toolManagerConfigValidator.xsd b/Step.Config/Config/toolManagerConfigValidator.xsd
index c554b87e..6be1591d 100644
--- a/Step.Config/Config/toolManagerConfigValidator.xsd
+++ b/Step.Config/Config/toolManagerConfigValidator.xsd
@@ -20,6 +20,7 @@
               <xs:element name="selfAdaptivePathOpt" type="xs:boolean" minOccurs='1' maxOccurs='1' />
               <xs:element name="dynamicCompensationOpt" type="xs:boolean" minOccurs='1' maxOccurs='1' />
               <xs:element name="ballufOpt" type="xs:boolean" minOccurs='1' maxOccurs='1' />
+              <xs:element name="integrityCheckOpt" type="xs:boolean" minOccurs='1' maxOccurs='1' />
             </xs:all>
           </xs:complexType>
         </xs:element>
diff --git a/Step.Config/ServerConfigController.cs b/Step.Config/ServerConfigController.cs
index 5768d74b..37e1d5b8 100644
--- a/Step.Config/ServerConfigController.cs
+++ b/Step.Config/ServerConfigController.cs
@@ -607,7 +607,8 @@ namespace Step.Config
                     MultidimensionalShankOpt = Convert.ToBoolean(x.Element("multidimensionalShankOpt").Value),
                     SelfAdaptivePathOpt = Convert.ToBoolean(x.Element("selfAdaptivePathOpt").Value),
                     DynamicCompensationOpt = Convert.ToBoolean(x.Element("dynamicCompensationOpt").Value),
-                    BallufOpt = Convert.ToBoolean(x.Element("ballufOpt").Value)                   
+                    BallufOpt = Convert.ToBoolean(x.Element("ballufOpt").Value),
+                    IntegrityCheckOpt = Convert.ToBoolean(x.Element("integrityCheckOpt").Value)  
                 })
                 .FirstOrDefault();
 
diff --git a/Step.Model/ConfigModels/ToolManagerConfigModel.cs b/Step.Model/ConfigModels/ToolManagerConfigModel.cs
index 88f26007..d2318d5d 100644
--- a/Step.Model/ConfigModels/ToolManagerConfigModel.cs
+++ b/Step.Model/ConfigModels/ToolManagerConfigModel.cs
@@ -23,6 +23,7 @@ namespace Step.Model.ConfigModels
         public bool SelfAdaptivePathOpt { get; set; }
         public bool DynamicCompensationOpt { get; set; }
         public bool BallufOpt { get; set; }
+        public bool IntegrityCheckOpt { get; set; }
 
         public CooligTranslations CooligsTranslations { get; set; }
 
diff --git a/Step.Model/DTOModels/ToolModels/DTONcToolModel.cs b/Step.Model/DTOModels/ToolModels/DTONcToolModel.cs
index bc491c5b..1dbbc7d5 100644
--- a/Step.Model/DTOModels/ToolModels/DTONcToolModel.cs
+++ b/Step.Model/DTOModels/ToolModels/DTONcToolModel.cs
@@ -30,6 +30,9 @@ namespace Step.Model.DTOModels.ToolModels
         [Required]
         public bool Measured { get; set; }
 
+        [Required]
+        public bool IntegrityCheck { get; set; }
+
         [Required]
         public bool ClockwiseRotation { get; set; }
 
@@ -55,15 +58,16 @@ namespace Step.Model.DTOModels.ToolModels
                 Disabled = bits[0],
                 Broken = bits[1],
                 Measured = bits[2],
-                ClockwiseRotation = bits[3],
-                CounterClockwiseRotation = bits[4],
+                IntegrityCheck = bits[3],
+                ClockwiseRotation = bits[4],
+                CounterClockwiseRotation = bits[5],
             };
         }
 
         public static explicit operator DbNcToolModel(DTONcTool obj)
         {
             // Prepare status byte
-            bool[] result = new bool[8] { obj.Disabled, obj.Broken, obj.Measured, obj.ClockwiseRotation, obj.CounterClockwiseRotation, false, false, false };
+            bool[] result = new bool[8] { obj.Disabled, obj.Broken, obj.Measured, obj.IntegrityCheck, obj.ClockwiseRotation, obj.CounterClockwiseRotation, false, false };
             byte status = ConvertArrayToByte(result);
 
             return new DbNcToolModel()
@@ -116,8 +120,9 @@ namespace Step.Model.DTOModels.ToolModels
                 Disabled = bits[0],
                 Broken = bits[1],
                 Measured = bits[2],
-                ClockwiseRotation = bits[3],
-                CounterClockwiseRotation = bits[4],
+                IntegrityCheck = bits[3],
+                ClockwiseRotation = bits[4],
+                CounterClockwiseRotation = bits[5],
                 OffsetId1 = obj.OffsetId1,
                 OffsetId2 = obj.OffsetId2,
                 OffsetId3 = obj.OffsetId3
@@ -127,7 +132,7 @@ namespace Step.Model.DTOModels.ToolModels
         public static explicit operator DbNcToolModel(DTONcToolModel obj)
         {           
             // Prepare status byte
-            bool[] result = new bool[8] { obj.Disabled, obj.Broken, obj.Measured, obj.ClockwiseRotation, obj.CounterClockwiseRotation, false, false, false };
+            bool[] result = new bool[8] { obj.Disabled, obj.Broken, obj.Measured, obj.IntegrityCheck, obj.ClockwiseRotation, obj.CounterClockwiseRotation, false, false };
             byte status = ConvertArrayToByte(result);
 
             return new DbNcToolModel()
@@ -172,8 +177,9 @@ namespace Step.Model.DTOModels.ToolModels
                 Disabled = bits[0],
                 Broken = bits[1],
                 Measured = bits[2],
-                ClockwiseRotation = bits[3],
-                CounterClockwiseRotation = bits[4],
+                IntegrityCheck = bits[3],
+                ClockwiseRotation = bits[4],
+                CounterClockwiseRotation = bits[5],
                 OffsetId1 = obj.OffsetId1,
                 OffsetId2 = obj.OffsetId2,
                 OffsetId3 = obj.OffsetId3
@@ -183,7 +189,7 @@ namespace Step.Model.DTOModels.ToolModels
         public static explicit operator DbNcToolModel(DTONewNcToolModel obj)
         {
             // Prepare status byte
-            bool[] result = new bool[8] { obj.Disabled, obj.Broken, obj.Measured, obj.ClockwiseRotation, obj.CounterClockwiseRotation, false, false, false};
+            bool[] result = new bool[8] { obj.Disabled, obj.Broken, obj.Measured, obj.IntegrityCheck, obj.ClockwiseRotation, obj.CounterClockwiseRotation, false, false};
             byte status = ConvertArrayToByte(result);
 
             return new DbNcToolModel()
diff --git a/Step.NC/SiemensToolTableAdapter.cs b/Step.NC/SiemensToolTableAdapter.cs
index 9576effc..05773d44 100644
--- a/Step.NC/SiemensToolTableAdapter.cs
+++ b/Step.NC/SiemensToolTableAdapter.cs
@@ -29,12 +29,7 @@ namespace Step.NC
             config.SelfAdaptivePathOptionActive = true;
             if (!ToolManagerConfig.SelfAdaptivePathOpt)
                 config.SelfAdaptivePathOptionActive = false;
-
-            // Update Tool types list
-            config.ToolsConfiguration.Where(x => x.Name == "toolTypeCode").FirstOrDefault().SelectValues = ToolManagerConfig 
-                .ToolTypes.Where(x => !x.Disabled)
-                .ToDictionary(x => x.Id, x => x.Id.ToString());
-
+            
             if (NcConfig.NcVendor != NC_VENDOR.SIEMENS && NcConfig.NcVendor != NC_VENDOR.DEMO)
             {
                 // Setup options
@@ -101,17 +96,32 @@ namespace Step.NC
 
                 if (!ToolManagerConfig.ReviveOpt)
                     categories.Add("revive");
-                
+
+                if (!ToolManagerConfig.IntegrityCheckOpt)
+                    categories.Add("integrityCheck");
+
                 // Remove category from configurations
-                config.ToolsConfiguration = config.ToolsConfiguration.Where(x => !categories.Contains(x.Category)).ToList();
+                config.ToolsConfiguration = config.ToolsConfiguration.Where(x => !categories.Contains(x.Category) && !categories.Contains(x.SubCategory)).ToList();
 
                 // Remove categories from familyConfig
                 config.FamiliesConfiguration.FamilyConfiguration = config.FamiliesConfiguration.FamilyConfiguration.Where(x => !categories.Contains(x.Category)).ToList();
-                // Filter by SUBCATEGORIES because "ReadOnlyFamily" categories are not populated
+                // Remove also SUBCATEGORIES because "ReadOnlyFamily" configuration has category field not populated
                 config.FamiliesConfiguration.FamilyReadOnlyConfiguration = config.FamiliesConfiguration.FamilyReadOnlyConfiguration.Where(x => !categories.Contains(x.SubCategory)).ToList();
 
                 config.ShanksConfiguration.ShankConfiguration = config.ShanksConfiguration.ShankConfiguration.Where(x => !categories.Contains(x.Category)).ToList();
                 config.MagazinePosConfiguration = config.MagazinePosConfiguration.Where(x => !categories.Contains(x.Category)).ToList();
+
+                // Update tool types list
+                config.FamiliesConfiguration.FamilyConfiguration.Where(x => x.Name == "toolType").FirstOrDefault().SelectValues = ToolManagerConfig
+                    .ToolTypes.Where(x => !x.Disabled)
+                    .ToDictionary(x => x.Id, x => x.Id.ToString());   
+            }
+            else if (NcConfig.NcVendor == NC_VENDOR.SIEMENS) // IF == SIEMENS
+            {
+                // Update Tool types list
+                config.ToolsConfiguration.Where(x => x.Name == "toolTypeCode").FirstOrDefault().SelectValues = ToolManagerConfig 
+                    .ToolTypes.Where(x => !x.Disabled)
+                    .ToDictionary(x => x.Id, x => x.Id.ToString());
             }
 
             return cmsError;
diff --git a/Step/Properties/AssemblyInfo.cs b/Step/Properties/AssemblyInfo.cs
index 19c9ec00..cfffbb4b 100644
--- a/Step/Properties/AssemblyInfo.cs
+++ b/Step/Properties/AssemblyInfo.cs
@@ -31,4 +31,4 @@ using System.Runtime.InteropServices;
 //
 // You can specify all the values or you can default the Revision and Build Numbers
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("1.3.1")]
+[assembly: AssemblyVersion("1.3.2")]