diff --git a/Libs/CMS_CORE_Library.dll b/Libs/CMS_CORE_Library.dll
index 225b8966..e7d3ad03 100644
Binary files a/Libs/CMS_CORE_Library.dll and b/Libs/CMS_CORE_Library.dll differ
diff --git a/Step.Config/ServerConfigController.cs b/Step.Config/ServerConfigController.cs
index c9b1454d..1421909c 100644
--- a/Step.Config/ServerConfigController.cs
+++ b/Step.Config/ServerConfigController.cs
@@ -356,7 +356,10 @@ namespace Step.Config
                        PhoneNumber = x.Element("phoneNumber").Value
                    })
                    .FirstOrDefault();
-
+            
+            var ci = new CultureInfo("en-US");
+            var formats = new[] { "M-d-yyyy HH:mm", "dd-MM-yyyy HH:mm", "MM-dd-yyyy HH:mm", "M/d/yyyy HH:mm", "dd/MM/yyyy HH:mm", "MM/dd/yyyy HH:mm" }
+                    .ToArray();
 
             MaintenancesConfig = xmlConfigFile
                 .Descendants("maintenances")
@@ -369,7 +372,7 @@ namespace Step.Config
                            y => y.Attribute("langKey").Value, y => y.Value
                         ),
                         Intervall = TimeSpan.FromMinutes(Convert.ToDouble(x.Element("interval").Value)),
-                        Deadline = DateTime.Parse(x.Element("deadline").Value),
+                        Deadline = DateTime.ParseExact(x.Element("deadline").Value, formats, CultureInfo.InvariantCulture, DateTimeStyles.AdjustToUniversal),
                         Type = x.Element("type").Value,
                         CouterId = Convert.ToInt32(x.Element("counterId").Value),
                         LocalizedDescription = x.Element("localizedDescription").Elements().ToDictionary( // Read localization of description 
diff --git a/Step.Core/ThreadsFunctions.cs b/Step.Core/ThreadsFunctions.cs
index 74110ab1..1770eb69 100644
--- a/Step.Core/ThreadsFunctions.cs
+++ b/Step.Core/ThreadsFunctions.cs
@@ -836,7 +836,8 @@ public static class ThreadsFunctions
 
                     foreach (M154DataModel m154 in data)
                     {
-                        if (CmsConnectConfig.Enabled)
+                        //if (CmsConnectConfig.Enabled)
+                        if(ServerStartupConfig.CmsConnectReady)
                         {
 
                             if (m154.Parameters.Count() >= 2 && m154.Parameters[0] == "SOUR")
diff --git a/Step.Model/Constants.cs b/Step.Model/Constants.cs
index 9a893f95..23a99699 100644
--- a/Step.Model/Constants.cs
+++ b/Step.Model/Constants.cs
@@ -5,7 +5,7 @@ namespace Step.Model
 {
     public static class Constants
     {
-        public static bool IS_BETA = true;   
+        public static bool IS_BETA = false;   
         public static string NOT_FOUND_ALARM_MESSAGE = "Alarm_id_{0} : Message not found";
         public static string NOT_CONFIGURATED_ALARM_MESSAGE = "Alarm_id_{0} : Message not configurated";
         public static string CMS_CONNECT_SETUP_ALARM_MESSAGE = "Error during CMS-Connect setup: Redis Db Not Found";
diff --git a/Step/Controllers/WebApi/NcFileController.cs b/Step/Controllers/WebApi/NcFileController.cs
index 19b7e460..63133e42 100644
--- a/Step/Controllers/WebApi/NcFileController.cs
+++ b/Step/Controllers/WebApi/NcFileController.cs
@@ -273,14 +273,7 @@ namespace Step.Controllers.WebApi
                 Directory.CreateDirectory(newFolder);
                 foreach (string filename in Directory.GetFiles(NcConfig.SharedPath))
                 {
-                    try
-                    {
-                        File.Move(filename, newFolder + Path.GetFileName(filename));
-                    }
-                    catch
-                    {
-                        return InternalServerError();
-                    }
+                    File.Move(filename, newFolder + Path.GetFileName(filename));
                 }
                 return Ok(true);
             }
diff --git a/Step/ReloginScript.bat b/Step/Utility/ReloginScript.bat
similarity index 100%
rename from Step/ReloginScript.bat
rename to Step/Utility/ReloginScript.bat