diff --git a/Ginger/GingerCoreCommon/Repository/BusinessFlowLib/Activity.cs b/Ginger/GingerCoreCommon/Repository/BusinessFlowLib/Activity.cs
index c729b0a013..61274b7108 100644
--- a/Ginger/GingerCoreCommon/Repository/BusinessFlowLib/Activity.cs
+++ b/Ginger/GingerCoreCommon/Repository/BusinessFlowLib/Activity.cs
@@ -929,10 +929,7 @@ public static Activity CopySharedRepositoryActivity(Activity srActivity, bool or
                 action.ParentGuid = action.Guid;
                 oldNewActionGuidList.Add(new(action.ParentGuid, action.Guid));
             }
-            foreach (VariableBase variable in copy.Variables)
-            {
-                variable.ParentGuid = variable.Guid;
-            }
+
             foreach (FlowControl fc in copy.Acts.SelectMany(a => a.FlowControls))
             {
                 Guid targetGuid = fc.GetGuidFromValue();
diff --git a/Ginger/GingerCoreNET/Drivers/CoreDrivers/Web/Selenium/SeleniumDriver.cs b/Ginger/GingerCoreNET/Drivers/CoreDrivers/Web/Selenium/SeleniumDriver.cs
index 927140ad99..ddabbd3718 100644
--- a/Ginger/GingerCoreNET/Drivers/CoreDrivers/Web/Selenium/SeleniumDriver.cs
+++ b/Ginger/GingerCoreNET/Drivers/CoreDrivers/Web/Selenium/SeleniumDriver.cs
@@ -803,12 +803,19 @@ public override void StartDriver()
                             SetUnhandledPromptBehavior(EDOpts);
                             if (IsUserProfileFolderPathValid())
                             {
-                                EDOpts.AddAdditionalEdgeOption("user-data-dir=", UserProfileFolderPath);
+                                EDOpts.AddArgument($"--user-data-dir={UserProfileFolderPath}");
                             }
                             else
                             {
                                 SetProxy(EDOpts);
                             }
+                            if (SeleniumUserArgs != null)
+                            {
+                                foreach (string arg in SeleniumUserArgs)
+                                {
+                                    EDOpts.AddArgument(arg);
+                                }
+                            }
                             SetCurrentPageLoadStrategy(EDOpts);
                             driverService = EdgeDriverService.CreateDefaultService();//CreateDefaultServiceFromOptions(EDOpts);
                             AddCustomDriverPath(driverService);
diff --git a/Ginger/GingerCoreNET/Repository/SharedRepositoryOperations.cs b/Ginger/GingerCoreNET/Repository/SharedRepositoryOperations.cs
index b83ed40d14..9c14417927 100644
--- a/Ginger/GingerCoreNET/Repository/SharedRepositoryOperations.cs
+++ b/Ginger/GingerCoreNET/Repository/SharedRepositoryOperations.cs
@@ -104,14 +104,7 @@ public Boolean UploadItemToRepository(Context context, UploadItemSelection itemT
                             }
                             srAction.ParentGuid = Guid.Empty;
                         }
-                        foreach (VariableBase srVariable in srActivity.Variables)
-                        {
-                            if (srVariable.ParentGuid != Guid.Empty)
-                            {
-                                srVariable.Guid = srVariable.ParentGuid;
-                            }
-                            srVariable.ParentGuid = Guid.Empty;
-                        }
+
                         foreach (Act action in srActivity.Acts.Cast<Act>())
                         {
                             foreach (FlowControl fc in action.FlowControls)
@@ -135,10 +128,6 @@ public Boolean UploadItemToRepository(Context context, UploadItemSelection itemT
                         {
                             bfAction.ParentGuid = bfAction.Guid;
                         }
-                        foreach (VariableBase bfVariable in bfActivity.Variables)
-                        {
-                            bfVariable.ParentGuid = bfVariable.Guid;
-                        }
                     }
                 }
 
@@ -629,14 +618,6 @@ public static async Task SaveLinkedActivity(Activity LinkedActivity, string Excl
                     }
                     action.ParentGuid = Guid.Empty;
                 }
-                foreach (VariableBase variable in sharedActivity.Variables)
-                {
-                    if (variable.ParentGuid != Guid.Empty)
-                    {
-                        variable.Guid = variable.ParentGuid;
-                    }
-                    variable.ParentGuid = Guid.Empty;
-                }
                 foreach (FlowControl fc in sharedActivity.Acts.SelectMany(a => a.FlowControls))
                 {
                     Guid targetGuid = fc.GetGuidFromValue();
diff --git a/Ginger/GingerCoreNET/RunLib/CLILib/CLIHelper.cs b/Ginger/GingerCoreNET/RunLib/CLILib/CLIHelper.cs
index 22fc3d47cb..0c1ab24fa2 100644
--- a/Ginger/GingerCoreNET/RunLib/CLILib/CLIHelper.cs
+++ b/Ginger/GingerCoreNET/RunLib/CLILib/CLIHelper.cs
@@ -351,7 +351,7 @@ private bool CheckforReRunConfig()
                         List<RunsetHLInfoResponse> accountReportRunset = accountReportApiHandler.GetRunsetExecutionDataFromCentralDB((Guid)mRunSetConfig.ReRunConfigurations.ReferenceExecutionID);
                         if (accountReportRunset != null && accountReportRunset.Count > 0)
                         {
-                            if (accountReportRunset.Any(x => !x.Status.Equals(eRunStatus.Failed.ToString(), StringComparison.CurrentCultureIgnoreCase)))
+                            if (accountReportRunset.Any(x => !x.Status.Equals(AccountReport.Contracts.Enum.eExecutionStatus.Failed.ToString(), StringComparison.CurrentCultureIgnoreCase)))
                             {
                                 Reporter.ToLog(eLogLevel.INFO, string.Format("The Runset is already Passed or In_progress for provided reference execution id: {0}", mRunSetConfig.ReRunConfigurations.ReferenceExecutionID));
                                 Result = false;
@@ -368,9 +368,9 @@ private bool CheckforReRunConfig()
                         List<AccountReportRunner> accountReportRunnerList = accountReportApiHandler.GetRunnerExecutionDataFromCentralDB((Guid)mRunSetConfig.ReRunConfigurations.ReferenceExecutionID);
                         if (accountReportRunnerList != null)
                         {
-                            if (accountReportRunnerList.Any(x => x.RunStatus.Equals(eRunStatus.Failed)))
+                            if (accountReportRunnerList.Any(x => x.RunStatus.Equals(AccountReport.Contracts.Enum.eExecutionStatus.Failed)))
                             {
-                                var FailedRunnerGuidList = accountReportRunnerList.Where(x => x.RunStatus.Equals(eRunStatus.Failed)).Select(x => x.EntityId);
+                                var FailedRunnerGuidList = accountReportRunnerList.Where(x => x.RunStatus.Equals(AccountReport.Contracts.Enum.eExecutionStatus.Failed)).Select(x => x.EntityId);
                                 foreach (GingerRunner runner in mRunsetExecutor.RunSetConfig.GingerRunners)
                                 {
                                     if (!FailedRunnerGuidList.Contains(runner.Guid))
@@ -396,10 +396,10 @@ private bool CheckforReRunConfig()
                         List<AccountReportBusinessFlow> accountReportBusinessFlows = accountReportApiHandler.GetBusinessflowExecutionDataFromCentralDB((Guid)mRunSetConfig.ReRunConfigurations.ReferenceExecutionID);
                         if (accountReportBusinessFlows != null && accountReportBusinessFlows.Count > 0)
                         {
-                            if (accountReportBusinessFlows.Any(x => x.RunStatus.Equals(eRunStatus.Failed)))
+                            if (accountReportBusinessFlows.Any(x => x.RunStatus.Equals(AccountReport.Contracts.Enum.eExecutionStatus.Failed)))
                             {
 
-                                var FailedBFGuidList = accountReportBusinessFlows.Where(x => x.RunStatus.Equals(eRunStatus.Failed)).Select(x => x.InstanceGUID);
+                                var FailedBFGuidList = accountReportBusinessFlows.Where(x => x.RunStatus.Equals(AccountReport.Contracts.Enum.eExecutionStatus.Failed)).Select(x => x.InstanceGUID);
                                 foreach (GingerRunner runner in mRunsetExecutor.RunSetConfig.GingerRunners)
                                 {
                                     foreach (BusinessFlowRun business in runner.BusinessFlowsRunList)