diff --git a/Common/CordonelPreadjustmentUi/PreAdjustmentControl.cs b/Common/CordonelPreadjustmentUi/PreAdjustmentControl.cs
index a5bc88ba..51bad287 100644
--- a/Common/CordonelPreadjustmentUi/PreAdjustmentControl.cs
+++ b/Common/CordonelPreadjustmentUi/PreAdjustmentControl.cs
@@ -1939,7 +1939,7 @@ namespace CordonelPreadjustmentUi
             }
         }
 
-        private void PushProgressBars(int totalSecondsEstm, DateTimeOffset totalStart, int currentProccessEstm, DateTimeOffset currentProccessStartTime)
+        public void PushProgressBars(int totalSecondsEstm, DateTimeOffset totalStart, int currentProccessEstm, DateTimeOffset currentProccessStartTime)
         {
             if (this.InvokeRequired)
             {
diff --git a/Common/Hardware/PLC/Siemens/Client/TestbenchAdapter/packages.config b/Common/Hardware/PLC/Siemens/Client/TestbenchAdapter/packages.config
new file mode 100644
index 00000000..b98096ef
--- /dev/null
+++ b/Common/Hardware/PLC/Siemens/Client/TestbenchAdapter/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="NLog" version="5.2.2" targetFramework="net451" />
+</packages>
\ No newline at end of file
diff --git a/Common/Hardware/WaterMeter/MagFlux/MagFluxCore/MagFluxMeter.cs b/Common/Hardware/WaterMeter/MagFlux/MagFluxCore/MagFluxMeter.cs
index aba3439a..2754e04c 100644
--- a/Common/Hardware/WaterMeter/MagFlux/MagFluxCore/MagFluxMeter.cs
+++ b/Common/Hardware/WaterMeter/MagFlux/MagFluxCore/MagFluxMeter.cs
@@ -898,6 +898,7 @@ namespace Xylem.Common.Hardware.WaterMeter.MagFlux.MagFluxCore
             {
                 throw new ApplicationException("Can not find an ongoing measurement");
             }
+            mainMeasurement.FlowDirectionforCalculatingVol = dir;
 
             var results = new List<MeasurementResults>();
             var mainResult = intermediateMeasurement
@@ -1034,7 +1035,6 @@ namespace Xylem.Common.Hardware.WaterMeter.MagFlux.MagFluxCore
         public void StopCalibration()
         {
             StopMeasurement();
-            RequestProtocol?.AbortDeviceForCalibration();
             RequestProtocol?.CloseConnection();
         }
 
diff --git a/Common/Hardware/WaterMeter/MagFlux/Protocols/StreamingProtocol/packages.config b/Common/Hardware/WaterMeter/MagFlux/Protocols/StreamingProtocol/packages.config
new file mode 100644
index 00000000..7df2ac52
--- /dev/null
+++ b/Common/Hardware/WaterMeter/MagFlux/Protocols/StreamingProtocol/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="NLog" version="5.2.2" targetFramework="net48" />
+</packages>
\ No newline at end of file
diff --git a/Common/Hardware/WaterMeter/WaterMeterCore/WaterMeterRegisters/obj/Debug/WaterMeterRegisters.csproj.CoreCompileInputs.cache b/Common/Hardware/WaterMeter/WaterMeterCore/WaterMeterRegisters/obj/Debug/WaterMeterRegisters.csproj.CoreCompileInputs.cache
index 8865d283..d110f5fc 100644
--- a/Common/Hardware/WaterMeter/WaterMeterCore/WaterMeterRegisters/obj/Debug/WaterMeterRegisters.csproj.CoreCompileInputs.cache
+++ b/Common/Hardware/WaterMeter/WaterMeterCore/WaterMeterRegisters/obj/Debug/WaterMeterRegisters.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-89102b0142e574de38a9f47d370f3334e5e6c268
+c43c40a030005a8f189e6179faf40a6d42bfef5c
diff --git a/Common/Logic/RelatePcb/packages.config b/Common/Logic/RelatePcb/packages.config
new file mode 100644
index 00000000..722b9bd3
--- /dev/null
+++ b/Common/Logic/RelatePcb/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="NLog" version="5.2.2" targetFramework="net40" />
+</packages>
\ No newline at end of file
diff --git a/Common/Logic/ServiceCore/packages.config b/Common/Logic/ServiceCore/packages.config
new file mode 100644
index 00000000..722b9bd3
--- /dev/null
+++ b/Common/Logic/ServiceCore/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="NLog" version="5.2.2" targetFramework="net40" />
+</packages>
\ No newline at end of file
diff --git a/Common/Metrology/Measurements/MeasurementRecord.cs b/Common/Metrology/Measurements/MeasurementRecord.cs
index d67b67a6..0f7e9434 100644
--- a/Common/Metrology/Measurements/MeasurementRecord.cs
+++ b/Common/Metrology/Measurements/MeasurementRecord.cs
@@ -20,7 +20,7 @@ namespace Xylem.Common.Metrology.Measurements
         public Double VolumeCm;
 
         /// <summary>
-        /// Reverse volume in cubic meters
+        /// Forward volume in cubic meters
         /// </summary>
         public Double ForwardVolumeCm;
 
diff --git a/Common/Tools/Tools.JsonToXlsHelper/obj/Debug/Tools.JsonToXlsHelper.csproj.CoreCompileInputs.cache b/Common/Tools/Tools.JsonToXlsHelper/obj/Debug/Tools.JsonToXlsHelper.csproj.CoreCompileInputs.cache
index dd8c285d..84b6b3be 100644
--- a/Common/Tools/Tools.JsonToXlsHelper/obj/Debug/Tools.JsonToXlsHelper.csproj.CoreCompileInputs.cache
+++ b/Common/Tools/Tools.JsonToXlsHelper/obj/Debug/Tools.JsonToXlsHelper.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-338bdd8d71c148c9df0972f903098eb23eacf0c9
+65d75c3322f8a137c69963cfdc0cb6f1ffacf62a
diff --git a/Common/Ui.ProductionControls/packages.config b/Common/Ui.ProductionControls/packages.config
new file mode 100644
index 00000000..722b9bd3
--- /dev/null
+++ b/Common/Ui.ProductionControls/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="NLog" version="5.2.2" targetFramework="net40" />
+</packages>
\ No newline at end of file
diff --git a/Common/Ui/DynamicStremingLogAnalyzer/packages.config b/Common/Ui/DynamicStremingLogAnalyzer/packages.config
new file mode 100644
index 00000000..fb695e10
--- /dev/null
+++ b/Common/Ui/DynamicStremingLogAnalyzer/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="NLog" version="5.2.2" targetFramework="net472" />
+</packages>
\ No newline at end of file
diff --git a/Common/Ui/IrdaDemo/packages.config b/Common/Ui/IrdaDemo/packages.config
new file mode 100644
index 00000000..a479e9c4
--- /dev/null
+++ b/Common/Ui/IrdaDemo/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="NLog" version="5.2.2" targetFramework="net46" />
+</packages>
\ No newline at end of file
diff --git a/Common/Ui/IrdaFunctionalTestApp/packages.config b/Common/Ui/IrdaFunctionalTestApp/packages.config
new file mode 100644
index 00000000..9f8a11fc
--- /dev/null
+++ b/Common/Ui/IrdaFunctionalTestApp/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="NLog" version="5.2.2" targetFramework="net461" />
+</packages>
\ No newline at end of file
diff --git a/Common/Ui/LegacyGenesisControl/PreAdjWr.cs b/Common/Ui/LegacyGenesisControl/PreAdjWr.cs
index 94e2509e..bafc7749 100644
--- a/Common/Ui/LegacyGenesisControl/PreAdjWr.cs
+++ b/Common/Ui/LegacyGenesisControl/PreAdjWr.cs
@@ -273,7 +273,7 @@ namespace XylemCommonUiLegacyGenCtl
                 }
                 else if (Mode == MeterTypes.MagFlux)
                 {
-   
+                    wrappedControl.StatusLabel("MagFlux Zeroflow is preparing");
                     var meterBatch = new MeterBatch();
 
                     foreach (var item in TestsetuptContainer?.meterTestSettings)
@@ -295,10 +295,28 @@ namespace XylemCommonUiLegacyGenCtl
                     var c = TestsetuptContainer.meterTestSettings.Count();
 
                     TestsetuptContainer.meterTestResults = new MeterTestResults[c];
-                    
+                    try
+                    {
 
-                    Thread.Sleep(60000);
 
+                        var testTimeMS = 300000;
+                        wrappedControl.StatusLabel("MagFlux Zeroflow is running");
+                        var Start = DateTimeOffset.Now;
+                        while (testTimeMS >= 0)
+                        {
+                            testTimeMS = testTimeMS - 50;
+                            wrappedControl.PushProgressBars(testTimeMS / 1000, Start, testTimeMS / 1000, Start);
+                            Thread.Sleep(50);
+                        }
+
+
+                    }
+                    catch (Exception ex)
+                    {
+
+                        MessageBox.Show(ex.Message);
+                    }
+                   
 
                     foreach (var meter in meterBatch.ListOfMeters)
                     {
diff --git a/Common/Ui/LegacyGenesisControl/ctlBatch.cs b/Common/Ui/LegacyGenesisControl/ctlBatch.cs
index 4edbed74..ac6deec1 100644
--- a/Common/Ui/LegacyGenesisControl/ctlBatch.cs
+++ b/Common/Ui/LegacyGenesisControl/ctlBatch.cs
@@ -1546,6 +1546,7 @@ namespace XylemCommonUiLegacyGenCtl
             }
             catch (Exception ex)
             {
+  
                 _logger.Error(ex, $"error on GetResults Slot={Slot},Chnnl={Chnnl},refVolQm={refVolQm},refTimeS={refTimeS}");
                 return null;
             }
@@ -1560,21 +1561,29 @@ namespace XylemCommonUiLegacyGenCtl
                 MeasurementResults? result;
                 var t = MeasurementDirection.TakeBoth;
 
-         
 
-                if (TestSetupContainer != null && TestSetupContainer.meterTestSettings != null && TestSetupContainer.meterTestSettings.Any(ts => ts.Slot == Slot))
+                try
                 {
-                   
-                    var testset = TestSetupContainer.meterTestSettings.First(ts => ts.Slot == Slot);
-                    if (testset.FlowTestingOnlyRevers)
+                    if (TestSetupContainer != null && TestSetupContainer.meterTestSettings != null && TestSetupContainer.meterTestSettings.Any(ts => ts != null && ts.Slot == Slot))
                     {
-                        t = MeasurementDirection.TakeOnlyBackward;
+
+                        var testset = TestSetupContainer.meterTestSettings.First(ts => ts != null && ts.Slot == Slot);
+                        if (testset.FlowTestingOnlyRevers)
+                        {
+                            t = MeasurementDirection.TakeOnlyBackward;
+                        }
+                        else if (testset.FlowTestingOnlyForward)
+                        {
+                            t = MeasurementDirection.TakeOnlyForward;
+                        }
                     }
-                    else if (testset.FlowTestingOnlyForward)
-                    {
-                        t = MeasurementDirection.TakeOnlyForward;
-                    }                  
                 }
+                catch (Exception ex)
+                {
+                    _logger.Error(ex, $"error on GetResults find Testcontainer Slot={Slot},Chnnl={Chnnl},refVolQm={refVolQm},refTimeS={refTimeS}");
+                    throw;
+                }
+               
                 result = GetMeasurementResult(Slot, Chnnl, refVolQm, refTimeS,t);
 
                 if (!result.HasValue)