diff --git a/src/DynamoCore/DynamoCore.csproj b/src/DynamoCore/DynamoCore.csproj
index 43f4166ff2e..bda6173ac6a 100644
--- a/src/DynamoCore/DynamoCore.csproj
+++ b/src/DynamoCore/DynamoCore.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <ImportGroup Label="PropertySheets">
     <Import Project="$(SolutionDir)Config\CS_SDK.props" />
   </ImportGroup>
@@ -27,11 +27,11 @@
   </ItemGroup>
   <ItemGroup Label="Common dependencies">
     <PackageReference Include="Autodesk.IDSDK" Version="1.1.6" />
+    <PackageReference Include="Greg" Version="3.0.0.2955" />
     <PackageReference Include="DynamoVisualProgramming.LibG_229_0_0" Version="3.0.0.2855" GeneratePathProperty="true" />
     <PackageReference Include="DynamoVisualProgramming.LibG_230_0_0" Version="3.0.0.2880" GeneratePathProperty="true" />
-    <PackageReference Include="Greg" Version="2.5.0.5076" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" CopyXML="true" />
-	  <PackageReference Include="RestSharp" Version="106.12.0" CopyXML="true" />
+	  <PackageReference Include="RestSharp" Version="109.0.1" CopyXML="true" />
 	<PackageReference Include="Lucene.Net" Version="4.8.0-beta00016" />
     <PackageReference Include="Lucene.Net.Analysis.Common" Version="4.8.0-beta00016" />
     <PackageReference Include="Lucene.Net.QueryParser" Version="4.8.0-beta00016" />
@@ -121,10 +121,10 @@
           <LibG230 Include="$(PkgDynamoVisualProgramming_LibG_230_0_0)\tools\netstandard2.0\$(LibGOsToken)\LibG_230_0_0\*" />
           <LibG229 Include="$(PkgDynamoVisualProgramming_LibG_229_0_0)\tools\netstandard2.0\$(LibGOsToken)\LibG_229_0_0\*" />
           <SampleFiles Include="$(SolutionDir)..\doc\distrib\Samples\**\*.*" />
-          <NodeHelpMDFiles Include="$(SolutionDir)..\doc\distrib\NodeHelpFiles\**\*.md"/>
-		  <NodeHelpDYNFiles Include="$(SolutionDir)..\doc\distrib\NodeHelpFiles\**\*.dyn"/>
-		  <NodeHelpTXTFiles Include="$(SolutionDir)..\doc\distrib\NodeHelpFiles\**\*.txt"/>
-		  <NodeHelpSATFiles Include="$(SolutionDir)..\doc\distrib\NodeHelpFiles\**\*.sat"/>
+          <NodeHelpMDFiles Include="$(SolutionDir)..\doc\distrib\NodeHelpFiles\**\*.md" />
+		  <NodeHelpDYNFiles Include="$(SolutionDir)..\doc\distrib\NodeHelpFiles\**\*.dyn" />
+		  <NodeHelpTXTFiles Include="$(SolutionDir)..\doc\distrib\NodeHelpFiles\**\*.txt" />
+		  <NodeHelpSATFiles Include="$(SolutionDir)..\doc\distrib\NodeHelpFiles\**\*.sat" />
           <NodeHelpJpgImageFiles Include="$(SolutionDir)..\doc\distrib\NodeHelpFiles\**\*.jpg" />
 		  <NodeHelpPngImageFiles Include="$(SolutionDir)..\doc\distrib\NodeHelpFiles\**\*.png" />
 		  <NodeHelpGifImageFiles Include="$(SolutionDir)..\doc\distrib\NodeHelpFiles\**\*.gif" />
diff --git a/src/DynamoCoreWpf/Controls/ShortcutToolbar.xaml b/src/DynamoCoreWpf/Controls/ShortcutToolbar.xaml
index 991fbddf586..5cb110c3de7 100644
--- a/src/DynamoCoreWpf/Controls/ShortcutToolbar.xaml
+++ b/src/DynamoCoreWpf/Controls/ShortcutToolbar.xaml
@@ -137,15 +137,17 @@
                 <Menu HorizontalAlignment="Right"
                       Style="{StaticResource MainMenu}"
                       Margin="0,0,10,0"
-                      IsMainMenu="True">
+                      IsMainMenu="True"
+                      Name="RightMenu">
                     <MenuItem Name="loginMenu" Margin="0,-3,-10,0">
                         <MenuItem.Header>
-                            <Button Name="LoginButton" Click="LoginButton_OnClick" Foreground="#DCDCDC" Padding="5,0,5,0">
+                            <Button Name="LoginButton" Click="LoginButton_OnClick" Foreground="#DCDCDC"
+                                    >
                                 <StackPanel FlowDirection="LeftToRight" Orientation="Horizontal">
 
                                     <Image Source="/DynamoCoreWpf;component/UI/Images/Profile_48px.png" Width="16" Height ="16"></Image>
 
-                                    <TextBlock Name="txtSignIn" Padding="10,5,5,5">
+                                    <TextBlock Name="txtSignIn" Padding="10,5,5,5" Visibility="{Binding ShowMenuItemText, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}">
                                         <TextBlock.Style>
                                             <Style TargetType="{x:Type TextBlock}">
                                                 <Setter Property="Text" Value="{x:Static p:Resources.SignInButtonText}" />
@@ -237,7 +239,8 @@
                                            VerticalAlignment="Center"
                                            Margin="10 0 0 0"
                                            Foreground="#DCDCDC"
-                                           FontFamily="{StaticResource ArtifaktElementRegular}">
+                                           FontFamily="{StaticResource ArtifaktElementRegular}"
+                                           Visibility="{Binding ShowMenuItemText, Converter={StaticResource BooleanToVisibilityCollapsedConverter}}">
                                 </TextBlock>
                             </StackPanel>
                         </MenuItem.Header>
diff --git a/src/DynamoCoreWpf/DynamoCoreWpf.csproj b/src/DynamoCoreWpf/DynamoCoreWpf.csproj
index 3e1741d6465..b260e126a29 100644
--- a/src/DynamoCoreWpf/DynamoCoreWpf.csproj
+++ b/src/DynamoCoreWpf/DynamoCoreWpf.csproj
@@ -132,10 +132,10 @@
       <PackageReference Include="DynamoVisualProgramming.LibG_229_0_0" Version="3.0.0.2855" />
     <PackageReference Include="FontAwesome5" Version="2.1.11" />
     <PackageReference Include="AvalonEdit" Version="6.3.0.90" CopyXML="true" />
-    <PackageReference Include="Greg" Version="2.5.0.5076" />
+    <PackageReference Include="Greg" Version="3.0.0.2955" />
     <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2045.28" />
 	<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-	<PackageReference Include="RestSharp" Version="106.12.0" />
+	<PackageReference Include="RestSharp" Version="109.0.1" />
 	<PackageReference Include="Cyotek.Drawing.BitmapFont" Version="2.0.0" />
 	<PackageReference Include="SharpDX" Version="4.2.0" />
 	<PackageReference Include="SharpDX.D3DCompiler" Version="4.2.0">
diff --git a/src/DynamoCoreWpf/Utilities/CrashReportTool.cs b/src/DynamoCoreWpf/Utilities/CrashReportTool.cs
index 721b01232e6..67249bb0f70 100644
--- a/src/DynamoCoreWpf/Utilities/CrashReportTool.cs
+++ b/src/DynamoCoreWpf/Utilities/CrashReportTool.cs
@@ -125,16 +125,23 @@ private static string FindCERToolInInstallLocations()
 
             try
             {
-                string rootFolder = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
-                var assemblyPath = Path.Combine(Path.Combine(rootFolder, "DynamoInstallDetective.dll"));
-                if (!File.Exists(assemblyPath))
-                    throw new FileNotFoundException(assemblyPath);
 
-                var assembly = Assembly.LoadFrom(assemblyPath);
-
-                var type = assembly.GetType("DynamoInstallDetective.Utilities");
+                // Try to directly get the type for the detective class
+                // (this will in many cases also load the assembly)
+                var type = Type.GetType("DynamoInstallDetective.Utilities, DynamoInstallDetective", false);
+                if (type == null)
+                {
+                    // fallback, load the assembly and get the type using LoadFrom
+                    string rootFolder = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
+                    var assemblyPath = Path.Combine(rootFolder, "DynamoInstallDetective.dll");
+                    if (!File.Exists(assemblyPath))
+                        throw new FileNotFoundException(assemblyPath);
+
+                    var assembly = Assembly.LoadFrom(assemblyPath);
+                    type = assembly.GetType("DynamoInstallDetective.Utilities");
+                }
 
-                var installationsMethod = type.GetMethod(
+                var installationsMethod = type.GetMethod(   
                     "FindMultipleProductInstallations",
                     BindingFlags.Public | BindingFlags.Static);
 
diff --git a/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs b/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs
index 08c82561638..c85167b2ab4 100644
--- a/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs
+++ b/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs
@@ -830,11 +830,19 @@ void Watch3DViewModelPropertyChanged(object sender, PropertyChangedEventArgs e)
             }
         }
 
+        internal event EventHandler WindowRezised;
+        internal void OnWindowResized(object underThreshold)
+        {
+            if(WindowRezised != null)
+            {
+                WindowRezised(underThreshold, new EventArgs());
+            }
+        }
 
         internal event EventHandler PreferencesWindowChanged;
         internal void OnPreferencesWindowChanged(object preferencesView)
         {
-            if(PreferencesWindowChanged != null)
+            if (PreferencesWindowChanged != null)
             {
                 PreferencesWindowChanged(preferencesView, new EventArgs());
             }
@@ -2669,6 +2677,7 @@ private void CloseHomeWorkspace(object parameter)
                 this.ShowStartPage = (Model.Workspaces.Count() <= 1);
                 RunSettings.ForceBlockRun = false;
                 OnEnableShortcutBarItems(false);
+                OnRequestCloseHomeWorkSpace();
             }
         }
 
diff --git a/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModelEvents.cs b/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModelEvents.cs
index 147202fcd9d..4151ec67908 100644
--- a/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModelEvents.cs
+++ b/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModelEvents.cs
@@ -162,6 +162,15 @@ private void OnRequestPaste()
             }
         }
 
+        internal event Action RequestCloseHomeWorkSpace;
+        private void OnRequestCloseHomeWorkSpace()
+        {
+            if (RequestCloseHomeWorkSpace != null)
+            {
+                RequestCloseHomeWorkSpace();
+            }
+        }
+
         internal event Action <object> RequestExportWorkSpaceAsImage;
         private void OnRequestExportWorkSpaceAsImage(object parameter)
         {
diff --git a/src/DynamoCoreWpf/ViewModels/Core/NodeViewModel.cs b/src/DynamoCoreWpf/ViewModels/Core/NodeViewModel.cs
index 7d056044482..31b89dc0818 100644
--- a/src/DynamoCoreWpf/ViewModels/Core/NodeViewModel.cs
+++ b/src/DynamoCoreWpf/ViewModels/Core/NodeViewModel.cs
@@ -1,14 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Collections.ObjectModel;
-using System.Collections.Specialized;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Windows;
-using System.Windows.Controls.Primitives;
-using System.Windows.Media;
 using Dynamo.Configuration;
 using Dynamo.Engine.CodeGeneration;
 using Dynamo.Graph;
@@ -18,9 +7,19 @@
 using Dynamo.Logging;
 using Dynamo.Models;
 using Dynamo.Selection;
-using Dynamo.UI;
 using Dynamo.Wpf.ViewModels.Core;
 using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Collections.Specialized;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Windows;
+using System.Windows.Controls.Primitives;
+using System.Windows.Media;
 using Point = System.Windows.Point;
 using Size = System.Windows.Size;
 
@@ -1349,7 +1348,7 @@ internal SolidColorBrush GetBorderColor()
 
             /*
                 Priorities seem to be:
-                Error > Warning > Info ; Frozen > Preview > None
+                Error > Warning > Info ; Frozen > Package > Preview > None
                 Pass through all possible states in reverse order 
                 to assign icon values for each possible scenario
             */
@@ -1358,14 +1357,6 @@ Pass through all possible states in reverse order
 
             if (this.NodeModel == null) return result;
 
-            if (this.NodeModel.IsCustomFunction)
-            {
-                result = nodeCustomColor;
-                if(result != null)
-                {
-                    ImgGlyphOneSource = packageGlyph;
-                }
-            }
             if (!this.IsVisible)
             {
                 result = nodePreviewColor;
@@ -1374,6 +1365,24 @@ Pass through all possible states in reverse order
                     ImgGlyphOneSource = previewGlyph;
                 } 
             }
+
+            if (this.NodeModel.IsCustomFunction)
+            {
+                result = nodeCustomColor;
+                if(result != null)
+                {
+                    if (ImgGlyphOneSource == null)
+                    {
+                        ImgGlyphOneSource = packageGlyph;
+                    }
+                    else
+                    {
+                        ImgGlyphOneSource = packageGlyph;
+                        ImgGlyphTwoSource = previewGlyph;
+                    }
+                }
+            }
+
             if (this.IsFrozen)
             {
                 result = nodeFrozenOverlayColor;
@@ -1382,7 +1391,7 @@ Pass through all possible states in reverse order
                     if (ImgGlyphOneSource == null)
                     {
                         ImgGlyphOneSource = frozenGlyph;
-                    }
+                    }   
                     else
                     {
                         ImgGlyphOneSource = frozenGlyph;
diff --git a/src/DynamoCoreWpf/ViewModels/Core/ShortcutToolbarViewModel.cs b/src/DynamoCoreWpf/ViewModels/Core/ShortcutToolbarViewModel.cs
index 632dcf6f5f8..d40902c1998 100644
--- a/src/DynamoCoreWpf/ViewModels/Core/ShortcutToolbarViewModel.cs
+++ b/src/DynamoCoreWpf/ViewModels/Core/ShortcutToolbarViewModel.cs
@@ -1,6 +1,7 @@
 using Dynamo.Core;
 using Dynamo.UI.Commands;
 using Dynamo.ViewModels;
+using System;
 
 namespace Dynamo.Wpf.ViewModels.Core
 {
@@ -15,14 +16,24 @@ internal class ShortcutToolbarViewModel : ViewModelBase
         private AuthenticationManager authManager;
 
         private int notificationsNumber;
+        private bool showMenuItemText;
+        public readonly DynamoViewModel DynamoViewModel;
 
         public ShortcutToolbarViewModel(DynamoViewModel dynamoViewModel)
         {
+            this.DynamoViewModel = dynamoViewModel;
             NotificationsNumber = 0;
             authManager = dynamoViewModel.Model.AuthenticationManager;
             ValidateWorkSpaceBeforeToExportAsImageCommand = new DelegateCommand(dynamoViewModel.ValidateWorkSpaceBeforeToExportAsImage);
             SignOutCommand = new DelegateCommand(authManager.ToggleLoginState);
             authManager.LoginStateChanged += (o) => { RaisePropertyChanged(nameof(LoginState)); };
+            this.DynamoViewModel.WindowRezised += OnDynamoViewModelWindowRezised;
+            ShowMenuItemText = true;
+        }
+
+        private void OnDynamoViewModelWindowRezised(object sender, System.EventArgs e)
+        {
+            if (sender is Boolean) ShowMenuItemText = !(bool)sender;                
         }
 
         /// <summary>
@@ -70,5 +81,27 @@ public bool IsNotificationsCounterVisible
                 return true;
             }
         }
+
+        /// <summary>
+        /// Indicates if a MenuItem display its text or not (only Icon)
+        /// </summary>
+        public bool ShowMenuItemText
+        {
+            get
+            {
+                return showMenuItemText;
+            }
+            set
+            {
+                showMenuItemText = value;
+                RaisePropertyChanged(nameof(ShowMenuItemText));
+            }
+        }
+
+        public override void Dispose()
+        {
+            this.DynamoViewModel.WindowRezised -= OnDynamoViewModelWindowRezised;
+            base.Dispose();
+        }
     }
 }
diff --git a/src/DynamoCoreWpf/ViewModels/Search/NodeAutoCompleteSearchViewModel.cs b/src/DynamoCoreWpf/ViewModels/Search/NodeAutoCompleteSearchViewModel.cs
index b89fe9ef7d3..d73a098fb5d 100644
--- a/src/DynamoCoreWpf/ViewModels/Search/NodeAutoCompleteSearchViewModel.cs
+++ b/src/DynamoCoreWpf/ViewModels/Search/NodeAutoCompleteSearchViewModel.cs
@@ -432,25 +432,19 @@ private MLNodeAutoCompletionResponse GetMLNodeAutocompleteResults(string request
             MLNodeAutoCompletionResponse results = null;
             var authProvider = dynamoViewModel.Model.AuthenticationManager.AuthProvider;
 
-            if (authProvider is IOAuth2AuthProvider oauth2AuthProvider)
+            if (authProvider is IOAuth2AuthProvider oauth2AuthProvider && authProvider is IOAuth2AccessTokenProvider tokenprovider)
             {
                 try
                 {
-                    // TODO: We need to implement something like GetToken() on the IOAuth2AuthProvider interface which will be used by all auth providers.
-                    // For now, we are mocking the RestSharpRequest object to set the IDSDK token and then update the header in actual RestRequest with that token.
-                    // LoginRequest() is also not available on RevitOAuth2Provider, so using the SignRequest() which will show the sign-in page when the user is logged out.
-                    RestRequest restSharpRequest = new RestRequest();
-                    RestClient restSharpClient = new RestClient();
-                    oauth2AuthProvider.SignRequest(ref restSharpRequest, restSharpClient);
-
                     var uri = DynamoUtilities.PathHelper.getServiceBackendAddress(this, nodeAutocompleteMLEndpoint);
                     var client = new RestClient(uri);
-                    var request = new RestRequest(Method.POST);
+                    var request = new RestRequest(string.Empty,Method.Post);
 
-                    request.AddHeader("Authorization", restSharpRequest.Parameters.FirstOrDefault(n => n.Name.Equals("Authorization")).Value.ToString());
-                    request = request.AddJsonBody(requestJSON) as RestRequest;
+                    request.AddHeader("Authorization",tokenprovider.GetAccessToken());
+                    request = request.AddJsonBody(requestJSON);
                     request.RequestFormat = DataFormat.Json;
-                    RestResponse response = client.Execute(request) as RestResponse;
+                    RestResponse response = client.Execute(request);
+                    //TODO maybe worth moving to system.text json in phases?
                     results = JsonConvert.DeserializeObject<MLNodeAutoCompletionResponse>(response.Content);
                 }
                 catch (Exception ex)
diff --git a/src/DynamoCoreWpf/Views/Core/DynamoView.xaml.cs b/src/DynamoCoreWpf/Views/Core/DynamoView.xaml.cs
index 3b070ee69ec..22e8d117c1b 100644
--- a/src/DynamoCoreWpf/Views/Core/DynamoView.xaml.cs
+++ b/src/DynamoCoreWpf/Views/Core/DynamoView.xaml.cs
@@ -84,6 +84,14 @@ public partial class DynamoView : Window, IDisposable
         private bool isPSSCalledOnViewModelNoCancel = false;
         private readonly DispatcherTimer _workspaceResizeTimer = new DispatcherTimer { Interval = new TimeSpan(0, 0, 0, 0, 500), IsEnabled = false };
         private ViewLoadedParams sharedViewExtensionLoadedParams;
+        /// <summary>
+        /// keeps the width right menu of the ShourtcutBar
+        /// </summary>
+        private double toolBarRightMenuWidth = 0;
+        /// <summary>
+        /// Keeps the additional Width based on the paddings and margins from the shorcutBar controls to calculate the whole Width
+        /// </summary>
+        private double additionalWidth = 50;
 
         /// <summary>
         /// Extensions currently displayed as windows.
@@ -101,6 +109,11 @@ internal PreferencesView PreferencesWindow {
             get { return preferencesWindow; }
         }
 
+        /// <summary>
+        /// Keeps the default value of the Window's MinWidth to calculate it again later
+        /// </summary>
+        internal double DefaultMinWidth = 0;
+
         /// <summary>
         /// Constructor
         /// </summary>
@@ -228,9 +241,12 @@ public DynamoView(DynamoViewModel dynamoViewModel)
             this.HideOrShowRightSideBar();
 
             this.dynamoViewModel.RequestPaste += OnRequestPaste;
+            this.dynamoViewModel.RequestCloseHomeWorkSpace += OnRequestCloseHomeWorkSpace;
             this.dynamoViewModel.RequestReturnFocusToView += OnRequestReturnFocusToView;
             this.dynamoViewModel.Model.WorkspaceSaving += OnWorkspaceSaving;
             this.dynamoViewModel.Model.WorkspaceOpened += OnWorkspaceOpened;
+            this.dynamoViewModel.Model.WorkspaceAdded += OnWorkspaceAdded;
+            this.dynamoViewModel.Model.WorkspaceHidden += OnWorkspaceHidden;
             this.dynamoViewModel.RequestEnableShortcutBarItems += DynamoViewModel_RequestEnableShortcutBarItems;
             this.dynamoViewModel.RequestExportWorkSpaceAsImage += OnRequestExportWorkSpaceAsImage;
 
@@ -244,8 +260,30 @@ public DynamoView(DynamoViewModel dynamoViewModel)
             {
                 Application.Current.MainWindow = this;
             }
+
+            DefaultMinWidth = MinWidth;
+    }
+
+        private void OnRequestCloseHomeWorkSpace()
+        {
+            CalculateWindowMinWidth();
         }
 
+        private void OnWorkspaceHidden(WorkspaceModel workspace)
+        {            
+            CalculateWindowMinWidth();
+        }
+
+        private void OnWorkspaceAdded(WorkspaceModel workspace)
+        {            
+            CalculateWindowMinWidth();
+        }
+
+        protected override async void OnContentRendered(EventArgs e)
+        {
+            base.OnContentRendered(e);
+            toolBarRightMenuWidth = shortcutBar.RightMenu.ActualWidth;
+        }
         private void OnRequestExportWorkSpaceAsImage(object parameter)
         {
             var workspace = this.ChildOfType<WorkspaceView>();
@@ -1027,6 +1065,43 @@ private void DynamoView_SizeChanged(object sender, SizeChangedEventArgs e)
             }
 
             UpdateGeometryScalingPopupLocation();
+            
+            CalculateWindowThreshold();
+        }
+
+        /// <summary>
+        /// Returns the sum of the width of the library, the width of the tabs from the workspace and the width of the shortcut toolbar.
+        /// </summary>
+        /// <returns></returns>
+        internal double GetSumOfControlsWidth()
+        {
+            List<TabItem> tabItems = WpfUtilities.ChildrenOfType<TabItem>(WorkspaceTabs).ToList();
+            double tabItemsWidth = tabItems.Count > 0 ? (double.IsNaN(tabItems[0].Width) ? 0 : tabItems[0].Width) * tabItems.Count : 0;
+            return Convert.ToDouble(dynamoViewModel.LibraryWidth) + tabItemsWidth + toolBarRightMenuWidth + additionalWidth;
+        }
+
+        /// <summary>
+        /// Calculates the Window threshold to display the text or only icons in the shortcut toolbar
+        internal void CalculateWindowThreshold()
+        {            
+            dynamoViewModel.OnWindowResized(dynamoViewModel.Model.PreferenceSettings.WindowW <= GetSumOfControlsWidth());            
+        }
+
+        /// <summary>
+        /// Calculates the Window minimum width bearing in mind the width of the controls and the current Window width, it's necessary to avoid the shortcut toolbar (gray) overlap the custom node tab (black)
+        /// </summary>
+        internal void CalculateWindowMinWidth()
+        {
+            if (dynamoViewModel.Model.PreferenceSettings.WindowW > DefaultMinWidth)
+            {
+                MinWidth = GetSumOfControlsWidth();
+            }
+            else
+            {
+                MinWidth = DefaultMinWidth;
+            }
+
+            CalculateWindowThreshold();
         }
 
         private void UpdateGeometryScalingPopupLocation()
@@ -1921,9 +1996,12 @@ private void WindowClosed(object sender, EventArgs e)
 
             //COMMANDS
             this.dynamoViewModel.RequestPaste -= OnRequestPaste;
+            this.dynamoViewModel.RequestCloseHomeWorkSpace -= OnRequestCloseHomeWorkSpace;
             this.dynamoViewModel.RequestReturnFocusToView -= OnRequestReturnFocusToView;
             this.dynamoViewModel.Model.WorkspaceSaving -= OnWorkspaceSaving;
             this.dynamoViewModel.Model.WorkspaceOpened -= OnWorkspaceOpened;
+            this.dynamoViewModel.Model.WorkspaceAdded -= OnWorkspaceAdded;
+            this.dynamoViewModel.Model.WorkspaceHidden -= OnWorkspaceHidden;
             this.dynamoViewModel.RequestEnableShortcutBarItems -= DynamoViewModel_RequestEnableShortcutBarItems;
             this.dynamoViewModel.RequestExportWorkSpaceAsImage -= OnRequestExportWorkSpaceAsImage;
 
diff --git a/src/DynamoPackages/DynamoPackages.csproj b/src/DynamoPackages/DynamoPackages.csproj
index e50a6e87407..a51e55c5446 100644
--- a/src/DynamoPackages/DynamoPackages.csproj
+++ b/src/DynamoPackages/DynamoPackages.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <ImportGroup Label="PropertySheets">
     <Import Project="$(SolutionDir)Config\CS_SDK.props" />
   </ImportGroup>
@@ -30,9 +30,9 @@
     <Content Include="PackageManagerExtension_ExtensionDefinition.xml" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Greg" Version="2.5.0.5076" />
+    <PackageReference Include="Greg" Version="3.0.0.2955" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-    <PackageReference Include="RestSharp" Version="106.12.0" />
+    <PackageReference Include="RestSharp" Version="109.0.1" />
   </ItemGroup>
   <ItemGroup>
     <Compile Update="Properties\Resources.Designer.cs">
diff --git a/src/DynamoPackages/PackageDirectoryBuilder.cs b/src/DynamoPackages/PackageDirectoryBuilder.cs
index e5d2b75f2b8..ed8ef09e683 100644
--- a/src/DynamoPackages/PackageDirectoryBuilder.cs
+++ b/src/DynamoPackages/PackageDirectoryBuilder.cs
@@ -2,9 +2,9 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Text.Json;
 using Dynamo.PackageManager.Interfaces;
 using Dynamo.Utilities;
-using RestSharp.Serialization.Json;
 
 namespace Dynamo.PackageManager
 {
@@ -127,8 +127,7 @@ private void WritePackageHeader(Package package, IDirectoryInfo rootDir)
             var pkgHeader = PackageUploadBuilder.NewRequestBody(package);
 
             // build the package header json, which will be stored with the pkg
-            var jsSer = new JsonSerializer();
-            var pkgHeaderStr = jsSer.Serialize(pkgHeader);
+            var pkgHeaderStr = JsonSerializer.Serialize(pkgHeader);
 
             // write the pkg header to the root directory of the pkg
             var headerPath = Path.Combine(rootDir.FullName, PackageJsonName);
diff --git a/src/PackageDetailsViewExtension/PackageDetailsViewExtension.csproj b/src/PackageDetailsViewExtension/PackageDetailsViewExtension.csproj
index e0db6072434..e28629ad5f1 100644
--- a/src/PackageDetailsViewExtension/PackageDetailsViewExtension.csproj
+++ b/src/PackageDetailsViewExtension/PackageDetailsViewExtension.csproj
@@ -14,9 +14,9 @@
     <EnableDefaultPageItems>false</EnableDefaultPageItems>
   </PropertyGroup>
   <ItemGroup>
-	<PackageReference Include="Greg" Version="2.5.0.5076" />
+	<PackageReference Include="Greg" Version="3.0.0.2955" />
 	<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-	<PackageReference Include="RestSharp" Version="106.12.0" />
+	<PackageReference Include="RestSharp" Version="109.0.1" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\DynamoCoreWpf\DynamoCoreWpf.csproj">
diff --git a/src/Tools/DynamoShapeManager/Utilities.cs b/src/Tools/DynamoShapeManager/Utilities.cs
index a39776284d5..90647d7157d 100644
--- a/src/Tools/DynamoShapeManager/Utilities.cs
+++ b/src/Tools/DynamoShapeManager/Utilities.cs
@@ -527,13 +527,19 @@ public static string GetGeometryFactoryPath2(string rootFolder, Version version)
 #endif
         private static IEnumerable GetAsmInstallations(string rootFolder)
         {
-            var assemblyPath = Path.Combine(Path.Combine(rootFolder, "DynamoInstallDetective.dll"));
-            if (!File.Exists(assemblyPath))
-                throw new FileNotFoundException(assemblyPath);
-
-            var assembly = Assembly.LoadFrom(assemblyPath);
+            // Try to directly get the type for the detective class
+            // (this will in many cases also load the assembly)
+            var type = Type.GetType("DynamoInstallDetective.Utilities, DynamoInstallDetective", false);
+            if (type == null)
+            {
+                // fallback, load the assembly and get the type using LoadFrom
+                var assemblyPath = Path.Combine(rootFolder, "DynamoInstallDetective.dll");
+                if (!File.Exists(assemblyPath))
+                    throw new FileNotFoundException(assemblyPath);
 
-            var type = assembly.GetType("DynamoInstallDetective.Utilities");
+                var assembly = Assembly.LoadFrom(assemblyPath);
+                type = assembly.GetType("DynamoInstallDetective.Utilities");
+            }
 
             var installationsMethod = type.GetMethod(
                 "FindMultipleProductInstallations",
diff --git a/src/Tools/NodeDocumentationMarkdownGenerator/NodeDocumentationMarkdownGenerator.csproj b/src/Tools/NodeDocumentationMarkdownGenerator/NodeDocumentationMarkdownGenerator.csproj
index f44a75da413..9f040f147b8 100644
--- a/src/Tools/NodeDocumentationMarkdownGenerator/NodeDocumentationMarkdownGenerator.csproj
+++ b/src/Tools/NodeDocumentationMarkdownGenerator/NodeDocumentationMarkdownGenerator.csproj
@@ -12,12 +12,12 @@
   </PropertyGroup>
     <ItemGroup>
         <PackageReference Include="CommandLineParser" Version="2.8.0" />
+        <PackageReference Include="Greg" Version="3.0.0.2955" />
         <PackageReference Include="DynamoVisualProgramming.LibG_229_0_0" Version="3.0.0.2855" />
-        <PackageReference Include="Greg" Version="2.5.0.5076" />
         <PackageReference Include="Magick.NET.Core" Version="7.0.1" />
         <PackageReference Include="Magick.NET-Q8-AnyCPU" Version="7.24.1" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-        <PackageReference Include="RestSharp" Version="106.12.0" />
+        <PackageReference Include="RestSharp" Version="109.0.1" />
         <PackageReference Include="System.Drawing.Common" Version="6.0.0" Condition=" '$(TargetFramework)' == 'net6.0' " />
     </ItemGroup>
   <ItemGroup>
diff --git a/test/DynamoCoreTests/DynamoCoreTests.csproj b/test/DynamoCoreTests/DynamoCoreTests.csproj
index 02fe36efa41..219eed1e37c 100644
--- a/test/DynamoCoreTests/DynamoCoreTests.csproj
+++ b/test/DynamoCoreTests/DynamoCoreTests.csproj
@@ -31,7 +31,7 @@
         </PackageReference>
     </ItemGroup>
     <ItemGroup>
-        <PackageReference Include="Greg" Version="2.5.0.5076">
+        <PackageReference Include="Greg" Version="3.0.0.2955">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
@@ -42,7 +42,10 @@
 
         <PackageReference Include="JUnitTestLogger" Version="1.1.0" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-        <PackageReference Include="RestSharp" Version="106.12.0" />
+        <PackageReference Include="RestSharp" Version="109.0.1">
+          <PrivateAssets>all</PrivateAssets>
+          <IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
         <PackageReference Include="Microsoft.Diagnostics.Runtime" Version="2.0.226801" GeneratePathProperty="true" />
     </ItemGroup>
   <ItemGroup>
diff --git a/test/DynamoCoreWpfTests/DynamoCoreWpfTests.csproj b/test/DynamoCoreWpfTests/DynamoCoreWpfTests.csproj
index 70c2f4dd8b1..beb3024c022 100644
--- a/test/DynamoCoreWpfTests/DynamoCoreWpfTests.csproj
+++ b/test/DynamoCoreWpfTests/DynamoCoreWpfTests.csproj
@@ -26,13 +26,16 @@
 	  <PackageReference Include="AvalonEdit" Version="6.3.0.90" />
     <PackageReference Include="Moq" Version="4.18.4" />
 	  <PackageReference Include="Cyotek.Drawing.BitmapFont" Version="2.0.0" />
-	  <PackageReference Include="Greg" Version="2.5.0.5076">
+	  <PackageReference Include="Greg" Version="3.0.0.2955">
 	    <PrivateAssets>all</PrivateAssets>
 	    <IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 	  </PackageReference>
 	  <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
 	  <PackageReference Include="NUnit" Version="3.13.3" />
-	  <PackageReference Include="RestSharp" Version="106.12.0" />
+	  <PackageReference Include="RestSharp" Version="109.0.1">
+	    <PrivateAssets>all</PrivateAssets>
+	    <IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+	  </PackageReference>
 	  <PackageReference Include="SharpDX" Version="4.2.0" />
 	  <PackageReference Include="SharpDX.D3DCompiler" Version="4.2.0" />
 	  <PackageReference Include="SharpDX.Direct2D1" Version="4.2.0" />
diff --git a/test/DynamoCoreWpfTests/ViewExtensions/ViewExtensionTests.cs b/test/DynamoCoreWpfTests/ViewExtensions/ViewExtensionTests.cs
index 5e8a72d5741..e918014ec48 100644
--- a/test/DynamoCoreWpfTests/ViewExtensions/ViewExtensionTests.cs
+++ b/test/DynamoCoreWpfTests/ViewExtensions/ViewExtensionTests.cs
@@ -20,6 +20,7 @@ public class ViewExtensionTests : DynamoTestUIBase
         [Test]
         public void OnWorkspaceChangedExtensionIsNotified()
         {
+            this.View.WindowState = WindowState.Maximized;
             RaiseLoadedEvent(this.View);
             var extensionManager = View.viewExtensionManager;
             extensionManager.Add(viewExtension);
diff --git a/test/Libraries/PackageManagerTests/PackageManagerTests.csproj b/test/Libraries/PackageManagerTests/PackageManagerTests.csproj
index 2b2599ad402..6d9824b3af3 100644
--- a/test/Libraries/PackageManagerTests/PackageManagerTests.csproj
+++ b/test/Libraries/PackageManagerTests/PackageManagerTests.csproj
@@ -14,10 +14,13 @@
   </PropertyGroup>
     <ItemGroup>
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
-        <PackageReference Include="RestSharp" Version="106.12.0" />
+        <PackageReference Include="RestSharp" Version="109.0.1">
+          <PrivateAssets>all</PrivateAssets>
+          <IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
         <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
         <PackageReference Include="Moq" Version="4.18.4" />
-        <PackageReference Include="Greg" Version="2.5.0.5076">
+        <PackageReference Include="Greg" Version="3.0.0.2955">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>