diff --git a/src/DynamoCore/Graph/Annotations/AnnotationModel.cs b/src/DynamoCore/Graph/Annotations/AnnotationModel.cs
index 51980cf95c8..1dc80cce685 100644
--- a/src/DynamoCore/Graph/Annotations/AnnotationModel.cs
+++ b/src/DynamoCore/Graph/Annotations/AnnotationModel.cs
@@ -395,6 +395,26 @@ internal set
         /// </summary>
         public bool HasNestedGroups => nodes.OfType<AnnotationModel>().Any();
 
+        private bool isVisible = true;
+        /// <summary>
+        /// Preview visibility of the nodes in a group
+        /// </summary>
+        [JsonIgnore]
+        public bool IsVisible
+        {
+            get
+            {
+                return isVisible;
+            }
+            internal set
+            {
+                if (value != isVisible)
+                {
+                    isVisible = value;
+                    RaisePropertyChanged(nameof(IsVisible));
+                }
+            }
+        }
         #endregion
 
         /// <summary>
diff --git a/src/DynamoCoreWpf/Controls/ShortcutToolbar.xaml.cs b/src/DynamoCoreWpf/Controls/ShortcutToolbar.xaml.cs
index c70697eb893..0e2e7b2180b 100644
--- a/src/DynamoCoreWpf/Controls/ShortcutToolbar.xaml.cs
+++ b/src/DynamoCoreWpf/Controls/ShortcutToolbar.xaml.cs
@@ -52,9 +52,13 @@ public ShortcutToolbar(DynamoViewModel dynamoViewModel)
             var shortcutToolbar = new ShortcutToolbarViewModel(dynamoViewModel);
             DataContext = shortcutToolbar;
             authManager = dynamoViewModel.Model.AuthenticationManager;
-            if (authManager.IsLoggedIn()) {
+            if (authManager.IsLoggedIn())
+            {
                 authManager.LoginStateChanged += SignOutHandler;
             }
+            else {
+                logoutOption.Visibility = Visibility.Collapsed;
+            }
         }
 
         private void SignOutHandler(LoginState status)
diff --git a/src/DynamoCoreWpf/Controls/StartPage.xaml b/src/DynamoCoreWpf/Controls/StartPage.xaml
index 5a10dd3e392..474a1e1ccfe 100644
--- a/src/DynamoCoreWpf/Controls/StartPage.xaml
+++ b/src/DynamoCoreWpf/Controls/StartPage.xaml
@@ -31,7 +31,7 @@
         </Grid.RowDefinitions>
 
         <!-- Begin top part (i.e. the "Start" tab) -->
-        <Border HorizontalAlignment="Stretch" Background="#3C3C3C" Margin="220,-40,0,49"></Border>
+        <Border HorizontalAlignment="Stretch" Background="#3C3C3C" Margin="220,-40,0,50"></Border>
   
         <!-- Begin Dynamo logo -->
         <Image Name="StartPageLogo"
diff --git a/src/DynamoCoreWpf/DynamoCoreWpf.csproj b/src/DynamoCoreWpf/DynamoCoreWpf.csproj
index a76957efdb2..ff158c7b001 100644
--- a/src/DynamoCoreWpf/DynamoCoreWpf.csproj
+++ b/src/DynamoCoreWpf/DynamoCoreWpf.csproj
@@ -19,6 +19,7 @@
   <ItemGroup>
     <None Remove="node_modules\%40dynamods\splash-screen\build\index.bundle.js" />
     <None Remove="node_modules\%40dynamods\splash-screen\build\index.html" />
+    <None Remove="UI\Images\question-hover-blue-16px.png" />
     <None Remove="Views\SplashScreen\WebApp\splashScreenBackground.png" />
   </ItemGroup>
   <ItemGroup>
@@ -70,6 +71,8 @@
   </ItemGroup>
   <ItemGroup>
   <PackageReference Include="DynamoVisualProgramming.LibG_229_0_0" Version="2.17.1.3967"/>
+  <PackageReference Include="DynamoVisualProgramming.LibG_229_0_0" Version="2.16.0.3736" />
+  <PackageReference Include="AvalonEdit" Version="4.3.1.9430" CopyXML="true" />
   <PackageReference Include="Greg" Version="2.3.0.2505" />
   <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.1264.42" />
 	<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
@@ -824,6 +827,7 @@
     <Resource Include="UI\Images\NodeStates\frozen-64px.png" />
     <Resource Include="UI\Images\NodeStates\hidden-64px.png" />
     <Resource Include="UI\Images\NodeStates\info-64px.png" />
+    <Resource Include="UI\Images\question-hover-blue-16px.png" />
     <Resource Include="UI\Images\TitleBarButtons\close-darktheme-default-16px.png" />
     <Resource Include="UI\Images\TitleBarButtons\close-lighttheme-default-16px.png" />
     <Resource Include="UI\Images\TitleBarButtons\close-lighttheme-hover-16px.png" />
diff --git a/src/DynamoCoreWpf/Properties/Resources.Designer.cs b/src/DynamoCoreWpf/Properties/Resources.Designer.cs
index c79dd578ebb..bf5cdfb20d9 100644
--- a/src/DynamoCoreWpf/Properties/Resources.Designer.cs
+++ b/src/DynamoCoreWpf/Properties/Resources.Designer.cs
@@ -1,4 +1,4 @@
-//------------------------------------------------------------------------------
+//------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
 //     Runtime Version:4.0.30319.42000
@@ -3299,6 +3299,15 @@ public static string GroupContextMenuGraphLayout {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Preview Geometry.
+        /// </summary>
+        public static string GroupContextMenuPreview {
+            get {
+                return ResourceManager.GetString("GroupContextMenuPreview", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Ungr_oup.
         /// </summary>
@@ -4604,7 +4613,7 @@ public static string NodeContextMenuIsOutput {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Preview.
+        ///   Looks up a localized string similar to Preview Geometry.
         /// </summary>
         public static string NodeContextMenuPreview {
             get {
diff --git a/src/DynamoCoreWpf/Properties/Resources.en-US.resx b/src/DynamoCoreWpf/Properties/Resources.en-US.resx
index ba83aca0a83..b69eafd7328 100644
--- a/src/DynamoCoreWpf/Properties/Resources.en-US.resx
+++ b/src/DynamoCoreWpf/Properties/Resources.en-US.resx
@@ -1419,7 +1419,7 @@ To avoid unintended behavior, uninstall the conflicting loaded package(s), resta
     <value>Is Output</value>
   </data>
   <data name="NodeContextMenuPreview" xml:space="preserve">
-    <value>Preview</value>
+    <value>Preview Geometry</value>
     <comment>Context menu item - preview geometry</comment>
   </data>
   <data name="NodeContextMenuRenameNode" xml:space="preserve">
@@ -3482,4 +3482,7 @@ In certain complex graphs or host program scenarios, Automatic mode may cause in
   <data name="SplashScreenSigningIn" xml:space="preserve">
     <value>Signing In</value>
   </data>
+  <data name="GroupContextMenuPreview" xml:space="preserve">
+    <value>Preview Geometry</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/DynamoCoreWpf/Properties/Resources.resx b/src/DynamoCoreWpf/Properties/Resources.resx
index f52c828e169..8e335b3c7fe 100644
--- a/src/DynamoCoreWpf/Properties/Resources.resx
+++ b/src/DynamoCoreWpf/Properties/Resources.resx
@@ -745,7 +745,7 @@
     <comment>Lacing strategy: use the shortest list</comment>
   </data>
   <data name="NodeContextMenuPreview" xml:space="preserve">
-    <value>Preview</value>
+    <value>Preview Geometry</value>
     <comment>Context menu item - preview geometry</comment>
   </data>
   <data name="NodeContextMenuRenameNode" xml:space="preserve">
@@ -3469,4 +3469,7 @@ In certain complex graphs or host program scenarios, Automatic mode may cause in
   <data name="SplashScreenSigningIn" xml:space="preserve">
     <value>Signing In</value>
   </data>
+  <data name="GroupContextMenuPreview" xml:space="preserve">
+    <value>Preview Geometry</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/DynamoCoreWpf/UI/Images/question-hover-blue-16px.png b/src/DynamoCoreWpf/UI/Images/question-hover-blue-16px.png
new file mode 100644
index 00000000000..37467b48893
Binary files /dev/null and b/src/DynamoCoreWpf/UI/Images/question-hover-blue-16px.png differ
diff --git a/src/DynamoCoreWpf/UI/Themes/Modern/DynamoModern.xaml b/src/DynamoCoreWpf/UI/Themes/Modern/DynamoModern.xaml
index f0a2c7f8b4b..b5508a4677e 100644
--- a/src/DynamoCoreWpf/UI/Themes/Modern/DynamoModern.xaml
+++ b/src/DynamoCoreWpf/UI/Themes/Modern/DynamoModern.xaml
@@ -5460,6 +5460,18 @@
             </Trigger>
         </Style.Triggers>
     </Style>
+    
+    <!-- Common Question Clickable Icon -->
+    <Style x:Key="QuestionIconClickable" TargetType="{x:Type Image}">
+        <Style.Triggers>
+            <Trigger Property="IsMouseOver" Value="False">
+                <Setter Property="Source" Value="pack://application:,,,/DynamoCoreWpf;component/UI/Images/question-default-16px.png" />
+            </Trigger>
+            <Trigger Property="IsMouseOver" Value="True">
+                <Setter Property="Source" Value="pack://application:,,,/DynamoCoreWpf;component/UI/Images/question-hover-blue-16px.png" />
+            </Trigger>
+        </Style.Triggers>
+    </Style>
 
     <!-- Common Question Icon -->
     <Style x:Key="QuestionIcon" TargetType="{x:Type Image}">
diff --git a/src/DynamoCoreWpf/ViewModels/Core/AnnotationViewModel.cs b/src/DynamoCoreWpf/ViewModels/Core/AnnotationViewModel.cs
index dcca11a7a9f..44158f05d50 100644
--- a/src/DynamoCoreWpf/ViewModels/Core/AnnotationViewModel.cs
+++ b/src/DynamoCoreWpf/ViewModels/Core/AnnotationViewModel.cs
@@ -614,6 +614,12 @@ private bool CanChangeFontSize(object obj)
         {
             return true;
         }
+
+        /// <summary>
+        /// Command to toggle this group's node preview visibility.
+        /// </summary>
+        [JsonIgnore]
+        public DelegateCommand ToggleIsVisibleGroupCommand { get; private set; }
         #endregion
 
         public AnnotationViewModel(WorkspaceViewModel workspaceViewModel, AnnotationModel model)
@@ -625,6 +631,7 @@ public AnnotationViewModel(WorkspaceViewModel workspaceViewModel, AnnotationMode
             model.PropertyChanged += model_PropertyChanged;
             model.RemovedFromGroup += OnModelRemovedFromGroup;
             model.AddedToGroup += OnModelAddedToGroup;
+            ToggleIsVisibleGroupCommand = new DelegateCommand(ToggleIsVisibleGroup, CanToggleIsVisibleGroup);
 
             DynamoSelection.Instance.Selection.CollectionChanged += SelectionOnCollectionChanged;
 
@@ -664,7 +671,7 @@ public AnnotationViewModel(WorkspaceViewModel workspaceViewModel, AnnotationMode
             groupStyleList = new ObservableCollection<Configuration.StyleItem>();
             //This will add the GroupStyles created in Preferences panel to the Group Style Context menu.
             LoadGroupStylesFromPreferences(preferenceSettings.GroupStyleItemsList);
-        }
+}
 
 
         /// <summary>
@@ -795,13 +802,6 @@ internal IEnumerable<PortModel> GetGroupOutPorts(IEnumerable<NodeModel> ownerNod
                 );
         }
 
-        private double GetPortVerticalOffset(PortModel portModel, int proxyPortIndex)
-        {
-            // calculate the vertical offset based on the port index.
-            double portHeight = portModel.Height;
-            return verticalOffset + (proxyPortIndex * portHeight) + portVerticalMidPoint;
-        }
-
         private Point2D CalculatePortPosition(PortModel portModel, double verticalPosition)
         {
             double groupHeaderHeight = Height - ModelAreaRect.Height;
@@ -1348,6 +1348,27 @@ private bool BelongsToGroup()
             return WorkspaceViewModel.Model.Annotations.ContainsModel(this.annotationModel);
         }
 
+        internal void ToggleIsVisibleGroup(object parameters)
+        {
+            DynamoSelection.Instance.ClearSelection();
+            var nodesInGroup = this.AnnotationModel.Nodes.Select(n => n.GUID).ToList();
+
+            var command = new DynamoModel.UpdateModelValueCommand(Guid.Empty,
+            nodesInGroup, nameof(this.AnnotationModel.IsVisible), (!this.AnnotationModel.IsVisible).ToString());
+
+            this.AnnotationModel.IsVisible = !this.AnnotationModel.IsVisible;
+            WorkspaceViewModel.DynamoViewModel.Model.ExecuteCommand(command);
+            WorkspaceViewModel.DynamoViewModel.RaiseCanExecuteUndoRedo();
+            WorkspaceViewModel.HasUnsavedChanges = true;
+
+            Analytics.TrackEvent(Actions.Preview, Categories.GroupOperations, this.AnnotationModel.IsVisible.ToString());
+        }
+
+        internal bool CanToggleIsVisibleGroup(object parameters)
+        {
+            return true;
+        }
+
         public override void Dispose()
         {
             annotationModel.PropertyChanged -= model_PropertyChanged;
diff --git a/src/DynamoCoreWpf/ViewModels/Core/ShortcutToolbarViewModel.cs b/src/DynamoCoreWpf/ViewModels/Core/ShortcutToolbarViewModel.cs
index 0398f628a85..ddb92b6ab5d 100644
--- a/src/DynamoCoreWpf/ViewModels/Core/ShortcutToolbarViewModel.cs
+++ b/src/DynamoCoreWpf/ViewModels/Core/ShortcutToolbarViewModel.cs
@@ -1,8 +1,6 @@
 using Dynamo.Core;
 using Dynamo.UI.Commands;
-using Dynamo.UI.Controls;
 using Dynamo.ViewModels;
-using System.Windows;
 
 namespace Dynamo.Wpf.ViewModels.Core
 {
diff --git a/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerSearchViewModel.cs b/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerSearchViewModel.cs
index 314941db58e..f29c36d91b7 100644
--- a/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerSearchViewModel.cs
+++ b/src/DynamoCoreWpf/ViewModels/PackageManager/PackageManagerSearchViewModel.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Collections.Specialized;
@@ -43,7 +43,8 @@ public enum PackageSortingKey
             Downloads,
             Votes,
             Maintainers,
-            LastUpdate
+            LastUpdate,
+            Search
         };
 
         /// <summary>
@@ -363,10 +364,15 @@ public PackageSearchState SearchState
         public DelegateCommand ClearCompletedCommand { get; set; }
 
         /// <summary>
-        ///     Sort the search results
+        ///     Sort the default results
         /// </summary>
         public DelegateCommand SortCommand { get; set; }
 
+        /// <summary>
+        ///     Sort the search results
+        /// </summary>
+        public DelegateCommand<object> SearchSortCommand { get; set; }
+
         /// <summary>
         ///     Set the sorting key for search results and resort
         /// </summary>
@@ -418,6 +424,7 @@ internal PackageManagerSearchViewModel()
             SearchDictionary = new SearchDictionary<PackageManagerSearchElement>();
             ClearCompletedCommand = new DelegateCommand(ClearCompleted, CanClearCompleted);
             SortCommand = new DelegateCommand(Sort, CanSort);
+            SearchSortCommand = new DelegateCommand<object>(Sort, CanSort);
             SetSortingKeyCommand = new DelegateCommand<object>(SetSortingKey, CanSetSortingKey);
             SetSortingDirectionCommand = new DelegateCommand<object>(SetSortingDirection, CanSetSortingDirection);
             ViewPackageDetailsCommand = new DelegateCommand<object>(ViewPackageDetails);
@@ -440,7 +447,7 @@ public PackageManagerSearchViewModel(PackageManagerClientViewModel client) : thi
         }
         
         /// <summary>
-        /// Sort the search results in the view based on the sorting key and sorting direction.
+        /// Sort the default package results in the view based on the sorting key and sorting direction.
         /// </summary>
         public void Sort()
         {
@@ -452,8 +459,6 @@ public void Sort()
                 list.Reverse();
             }
 
-            Analytics.TrackEvent(Actions.Sort, Categories.PackageManagerOperations, $"{SortingDirection}");
-
             // temporarily hide binding
             var temp = this.SearchResults;
             this.SearchResults = null;
@@ -468,6 +473,35 @@ public void Sort()
             this.SearchResults = temp;
         }
 
+        /// <summary>
+        /// Sort the package search results in the view based on the closest hit to the search key.
+        /// </summary>
+        private void Sort(object searchQuery = null)
+        {
+            if (searchQuery == null)
+            {
+                this.Sort();
+            }
+            else
+            {
+                var list = this.SearchResults.AsEnumerable().ToList();
+                Sort(list, PackageSortingKey.Search, searchQuery.ToString());
+
+                // temporarily hide binding
+                var temp = this.SearchResults;
+                this.SearchResults = null;
+
+                temp.Clear();
+
+                foreach (var ele in list)
+                {
+                    temp.Add(ele);
+                }
+
+                this.SearchResults = temp;
+            }
+        }
+
         /// <summary>
         /// Based on the known hosts received from Package Manager server,
         /// initialize the host filter in Dynamo
@@ -484,7 +518,7 @@ public List<FilterEntry> InitializeHostFilter()
         }
 
         /// <summary>
-        /// Can search be performed.  Used by the associated command
+        /// Can search be performed.  Used by the associated command : SortCommand
         /// </summary>
         /// <returns></returns>
         public bool CanSort()
@@ -492,6 +526,15 @@ public bool CanSort()
             return true;
         }
 
+        /// <summary>
+        /// Can search be performed.  Used by the associated command : SearchSortCommand
+        /// </summary>
+        /// <returns></returns>
+        private bool CanSort(object s)
+        {
+            return true;
+        }
+
         /// <summary>
         /// Set the sorting direction.  Used by the associated command.
         /// </summary>
@@ -619,6 +662,8 @@ public void SetSortingKey(object sortingKey)
                 this.SortingKey = (PackageSortingKey)sortingKey;
             }
 
+            Analytics.TrackEvent(Actions.Sort, Categories.PackageManagerOperations, $"{sortingKey}");
+
             this.Sort();
         }
 
@@ -695,6 +740,9 @@ public void RefreshAndSearchAsync()
 
         internal void RefreshInfectedPackages()
         {
+            //do not call a protected route, if user is not logged in already.
+            if (PackageManagerClientViewModel.LoginState !=  Greg.AuthProviders.LoginState.LoggedIn) return;
+
             var infectedPkgs = PackageManagerClientViewModel.GetInfectedPackages();
             infectedPkgs.Sort((e1, e2) => e1.InfectedPackageCreationDate.CompareTo(e2.InfectedPackageCreationDate));
 
@@ -842,7 +890,7 @@ internal void SearchAndUpdateResults(string query)
                 this.AddToSearchResults(result);
             }
 
-            this.Sort();
+            this.Sort(query);
 
             SearchState = HasNoResults ? PackageSearchState.NoResults : PackageSearchState.Results;
         }
@@ -961,7 +1009,9 @@ internal IEnumerable<PackageManagerSearchElementViewModel> Search(string query)
         /// Sort a list of search results by the given key
         /// </summary>
         /// <param name="results"></param>
-        private static void Sort(List<PackageManagerSearchElementViewModel> results, PackageSortingKey key)
+        /// <param name="key"></param>
+        /// <param name="query"></param>
+        private static void Sort(List<PackageManagerSearchElementViewModel> results, PackageSortingKey key, string query = null)
         {
             switch (key)
             {
@@ -972,7 +1022,7 @@ private static void Sort(List<PackageManagerSearchElementViewModel> results, Pac
                     results.Sort((e1, e2) => e1.Model.Downloads.CompareTo(e2.Model.Downloads));
                     break;
                 case PackageSortingKey.LastUpdate:
-                    results.Sort((e1, e2) => e1.Versions.Last().Item1.created.CompareTo(e2.Versions.Last().Item1.created));
+                    results.Sort((e1, e2) => e1.Versions.FirstOrDefault().Item1.created.CompareTo(e2.Versions.FirstOrDefault().Item1.created));
                     break;
                 case PackageSortingKey.Votes:
                     results.Sort((e1, e2) => e1.Model.Votes.CompareTo(e2.Model.Votes));
@@ -980,6 +1030,18 @@ private static void Sort(List<PackageManagerSearchElementViewModel> results, Pac
                 case PackageSortingKey.Maintainers:
                     results.Sort((e1, e2) => e1.Model.Maintainers.ToLower().CompareTo(e2.Model.Maintainers.ToLower()));
                     break;
+                //This sorting key is applied to search results when user submits a search query on package manager search window,
+                //it sorts in the following order: Not Deprecated Packages > search query in Name > Recently Updated
+                case PackageSortingKey.Search:
+                    results.Sort((e1, e2) => {
+                        int ret = e1.Model.IsDeprecated.CompareTo(e2.Model.IsDeprecated);
+                        int i1 = e1.Model.Name.ToLower().IndexOf(query.ToLower(), StringComparison.InvariantCultureIgnoreCase);
+                        int i2 = e2.Model.Name.ToLower().IndexOf(query.ToLower(), StringComparison.InvariantCultureIgnoreCase);
+                        ret = ret != 0 ? ret : ((i1 == -1) ? int.MaxValue : i1).CompareTo((i2 == -1) ? int.MaxValue : i2);
+                        ret = ret != 0 ? ret : -e1.Versions.FirstOrDefault().Item1.created.CompareTo(e2.Versions.FirstOrDefault().Item1.created);
+                        return ret;
+                    });
+                    break;
             }
         }
 
diff --git a/src/DynamoCoreWpf/Views/Core/AnnotationView.xaml b/src/DynamoCoreWpf/Views/Core/AnnotationView.xaml
index 208943b08c8..5df150c1f47 100644
--- a/src/DynamoCoreWpf/Views/Core/AnnotationView.xaml
+++ b/src/DynamoCoreWpf/Views/Core/AnnotationView.xaml
@@ -340,6 +340,11 @@
                 <MenuItem Name="UngroupAnnotation"
                           Click="OnUngroupAnnotation"
                           Header="{x:Static p:Resources.GroupContextMenuUngroup}" />
+                <MenuItem Name="PreviewAnnotation"
+                          Command="{Binding Path=ToggleIsVisibleGroupCommand}"
+                          Header="{x:Static p:Resources.GroupContextMenuPreview}"
+                          IsCheckable="true"
+                          IsChecked="{Binding Path=AnnotationModel.IsVisible, Mode=OneWay}"/>
                 <MenuItem Name="unGroup_cm"
                           Command="{Binding Path=RemoveGroupFromGroupCommand}"
                           Header="{x:Static p:Resources.ContextUnGroupFromSelection}" />
diff --git a/src/DynamoCoreWpf/Views/Core/DynamoView.xaml b/src/DynamoCoreWpf/Views/Core/DynamoView.xaml
index ea757055b84..cdf6a979763 100644
--- a/src/DynamoCoreWpf/Views/Core/DynamoView.xaml
+++ b/src/DynamoCoreWpf/Views/Core/DynamoView.xaml
@@ -740,11 +740,6 @@
                 <ColumnDefinition Width="Auto"></ColumnDefinition>
             </Grid.ColumnDefinitions>
 
-            <Grid Name="loginGrid" 
-                  Grid.Row="0" 
-                  Grid.Column="1">
-            </Grid>
-
             <Border Name="shortcutBarBorder"
                     BorderThickness="0"
                     HorizontalAlignment="Stretch"
diff --git a/src/DynamoCoreWpf/Views/Menu/PreferencesView.xaml b/src/DynamoCoreWpf/Views/Menu/PreferencesView.xaml
index 85a2c98ee7d..0f8dd23a142 100644
--- a/src/DynamoCoreWpf/Views/Menu/PreferencesView.xaml
+++ b/src/DynamoCoreWpf/Views/Menu/PreferencesView.xaml
@@ -257,17 +257,18 @@
                                                    Height="26" 
                                                    Width="53"
                                                    Margin="0 3 0 0">
-                                            <Label.ToolTip>
-                                                <ToolTip Content="{x:Static p:Resources.PreferencesViewDefaultRunSettingsInfoTooltip}" Style="{StaticResource GenericToolTipLight}"/>
-                                            </Label.ToolTip>
-                                            <Label.Content>
-                                                <fa:ImageAwesome Width="15" 
-                                                                Height="15" 
-                                                                VerticalAlignment="Bottom" 
-                                                                HorizontalAlignment="Left" 
-                                                                Icon="QuestionCircleOutline" 
-                                                                Foreground="{StaticResource PreferencesWindowFontColor}"/>
-                                            </Label.Content>
+                                            <Image
+                                               Margin="5,3,0,0"
+                                               Width="14"
+                                               Height="14"
+                                               HorizontalAlignment="Center"
+                                               VerticalAlignment="Center"
+                                               Style="{StaticResource QuestionIcon}"
+                                               ToolTipService.ShowDuration="30000">
+                                                <Image.ToolTip>
+                                                    <ToolTip Content="{x:Static p:Resources.PreferencesViewDefaultRunSettingsInfoTooltip}" Style="{StaticResource GenericToolTipLight}"/>
+                                                </Image.ToolTip>
+                                            </Image>                                            
                                         </Label>
                                     </WrapPanel>
                                     <Grid Grid.Row="1">
@@ -460,7 +461,7 @@
                                                Margin="30,0,0,0"
                                                HorizontalAlignment="Left"
                                                VerticalAlignment="Center"
-                                               Style="{StaticResource ToggleInfoStyle}">
+                                               Style="{StaticResource QuestionIcon}">
                                             <Image.ToolTip>
                                                 <ToolTip Content="{x:Static p:Resources.RecentFileNumberInfo}" Style="{StaticResource GenericToolTipLight}"/>
                                             </Image.ToolTip>
@@ -733,7 +734,7 @@
                                                Height="14"
                                                HorizontalAlignment="Center"
                                                VerticalAlignment="Center"
-                                               Style="{StaticResource QuestionIcon}"
+                                               Style="{StaticResource QuestionIconClickable}"
                                                MouseDown="OnMoreInfoClicked"
                                                ToolTipService.ShowDuration="30000">
                                             <Image.ToolTip>
@@ -1109,17 +1110,18 @@
                                                    Height="26" 
                                                    Width="53"
                                                    Margin="0 3 0 0">
-                                            <Label.ToolTip>
-                                                <ToolTip Content="{x:Static p:Resources.PreferencesWindowHardwareAccelerationTooltip}" Style="{StaticResource GenericToolTipLight}"/>
-                                            </Label.ToolTip>
-                                            <Label.Content>
-                                                <fa:ImageAwesome Width="15" 
-                                                                Height="15" 
-                                                                VerticalAlignment="Bottom" 
-                                                                HorizontalAlignment="Left" 
-                                                                Icon="QuestionCircleOutline" 
-                                                                Foreground="{StaticResource PreferencesWindowFontColor}"/>
-                                            </Label.Content>
+                                            <Image
+                                               Margin="5,3,0,0"
+                                               Width="14"
+                                               Height="14"
+                                               HorizontalAlignment="Center"
+                                               VerticalAlignment="Center"
+                                               Style="{StaticResource QuestionIcon}"
+                                               ToolTipService.ShowDuration="30000">
+                                                <Image.ToolTip>
+                                                    <ToolTip Content="{x:Static p:Resources.PreferencesWindowHardwareAccelerationTooltip}" Style="{StaticResource GenericToolTipLight}"/>
+                                                </Image.ToolTip>
+                                            </Image>
                                         </Label>
                                     </StackPanel>
                                     
@@ -1142,17 +1144,18 @@
                                                    Height="26" 
                                                    Width="53"
                                                    Margin="0 3 0 0">
-                                            <Label.ToolTip>
-                                                <ToolTip Content="{x:Static p:Resources.PreferencesWindowIsolateSelectedGeoTooltip}" Style="{StaticResource GenericToolTipLight}"/>
-                                            </Label.ToolTip>
-                                            <Label.Content>
-                                                <fa:ImageAwesome Width="15" 
-                                                                Height="15" 
-                                                                VerticalAlignment="Bottom" 
-                                                                HorizontalAlignment="Left" 
-                                                                Icon="QuestionCircleOutline" 
-                                                                Foreground="{StaticResource PreferencesWindowFontColor}"/>
-                                            </Label.Content>
+                                            <Image 
+                                               Margin="5,3,0,0"
+                                               Width="14"
+                                               Height="14"
+                                               HorizontalAlignment="Center"
+                                               VerticalAlignment="Center"
+                                               Style="{StaticResource QuestionIcon}"
+                                               ToolTipService.ShowDuration="30000">
+                                                <Image.ToolTip>
+                                                    <ToolTip Content="{x:Static p:Resources.PreferencesWindowIsolateSelectedGeoTooltip}" Style="{StaticResource GenericToolTipLight}"/>
+                                                </Image.ToolTip>
+                                            </Image>
                                         </Label>
                                     </StackPanel>
 
@@ -1175,17 +1178,18 @@
                                                    Height="26" 
                                                    Width="53"
                                                    Margin="0 3 0 0">
-                                            <Label.ToolTip>
-                                                <ToolTip Content="{x:Static p:Resources.PreferencesWindowShowEdgesTooltip}" Style="{StaticResource GenericToolTipLight}"/>
-                                            </Label.ToolTip>
-                                            <Label.Content>
-                                                <fa:ImageAwesome Width="15" 
-                                                                Height="15" 
-                                                                VerticalAlignment="Bottom" 
-                                                                HorizontalAlignment="Left" 
-                                                                Icon="QuestionCircleOutline" 
-                                                                Foreground="{StaticResource PreferencesWindowFontColor}"/>
-                                            </Label.Content>
+                                            <Image
+                                               Margin="5,3,0,0"
+                                               Width="14"
+                                               Height="14"
+                                               HorizontalAlignment="Center"
+                                               VerticalAlignment="Center"
+                                               Style="{StaticResource QuestionIcon}"
+                                               ToolTipService.ShowDuration="30000">
+                                                <Image.ToolTip>
+                                                    <ToolTip Content="{x:Static p:Resources.PreferencesWindowShowEdgesTooltip}" Style="{StaticResource GenericToolTipLight}"/>
+                                                </Image.ToolTip>
+                                            </Image>
                                         </Label>
                                     </StackPanel>
                                     
@@ -1208,17 +1212,18 @@
                                                    Height="26" 
                                                    Width="53"
                                                    Margin="0 3 0 0">
-                                            <Label.ToolTip>
-                                                <ToolTip Content="{x:Static p:Resources.PreferencesWindowShowCodeBlockNodeLineNumberTooltip}" Style="{StaticResource GenericToolTipLight}"/>
-                                            </Label.ToolTip>
-                                            <Label.Content>
-                                                <fa:ImageAwesome Width="15" 
-                                                                Height="15" 
-                                                                VerticalAlignment="Bottom" 
-                                                                HorizontalAlignment="Left" 
-                                                                Icon="QuestionCircleOutline" 
-                                                                Foreground="{StaticResource PreferencesWindowFontColor}"/>
-                                            </Label.Content>
+                                            <Image
+                                               Margin="5,3,0,0"
+                                               Width="14"
+                                               Height="14"
+                                               HorizontalAlignment="Center"
+                                               VerticalAlignment="Center"
+                                               Style="{StaticResource QuestionIcon}"
+                                               ToolTipService.ShowDuration="30000">
+                                                <Image.ToolTip>
+                                                    <ToolTip Content="{x:Static p:Resources.PreferencesWindowShowCodeBlockNodeLineNumberTooltip}" Style="{StaticResource GenericToolTipLight}"/>
+                                                </Image.ToolTip>
+                                            </Image>
                                         </Label>
                                     </StackPanel>
 
@@ -1241,17 +1246,18 @@
                                                    Height="26" 
                                                    Width="53"
                                                    Margin="0 3 0 0">
-                                            <Label.ToolTip>
-                                                <ToolTip Content="{x:Static p:Resources.PreferencesWindowShowPreviewBubblesTooltip}" Style="{StaticResource GenericToolTipLight}"/>
-                                            </Label.ToolTip>
-                                            <Label.Content>
-                                                <fa:ImageAwesome Width="15" 
-                                                                Height="15" 
-                                                                VerticalAlignment="Bottom" 
-                                                                HorizontalAlignment="Left" 
-                                                                Icon="QuestionCircleOutline" 
-                                                                Foreground="{StaticResource PreferencesWindowFontColor}"/>
-                                            </Label.Content>
+                                            <Image
+                                               Margin="5,3,0,0"
+                                               Width="14"
+                                               Height="14"
+                                               HorizontalAlignment="Center"
+                                               VerticalAlignment="Center"
+                                               Style="{StaticResource QuestionIcon}"
+                                               ToolTipService.ShowDuration="30000">
+                                                <Image.ToolTip>
+                                                    <ToolTip Content="{x:Static p:Resources.PreferencesWindowShowPreviewBubblesTooltip}" Style="{StaticResource GenericToolTipLight}"/>
+                                                </Image.ToolTip>
+                                            </Image>
                                         </Label>
                                     </StackPanel>
                                 </Grid>
@@ -1326,7 +1332,7 @@
                                                Height="16"
                                                HorizontalAlignment="Center"
                                                VerticalAlignment="Center"
-                                               Style="{StaticResource ToggleInfoStyle}">
+                                               Style="{StaticResource QuestionIcon}">
                                             <Image.ToolTip>
                                                 <ToolTip Content="{x:Static p:Resources.DisableBuiltInPackageToggleInfo}" Style="{StaticResource GenericToolTipLight}"/>
                                             </Image.ToolTip>
@@ -1351,7 +1357,7 @@
                                                Height="16"
                                                HorizontalAlignment="Center"
                                                VerticalAlignment="Center"
-                                               Style="{StaticResource ToggleInfoStyle}">
+                                               Style="{StaticResource QuestionIcon}">
                                             <Image.ToolTip>
                                                 <ToolTip Content="{x:Static p:Resources.DisableCustomPackageToggleInfo}" Style="{StaticResource GenericToolTipLight}"/>
                                             </Image.ToolTip>
@@ -1423,17 +1429,18 @@
                                                    Width="53"
                                                    Margin="0 3 0 0"
                                                    MouseLeftButtonDown="OnMoreInfoClicked">
-                                                <Label.ToolTip>
-                                                    <ToolTip Content="{x:Static p:Resources.PreferencesViewTrustWarningTooltipText}" Style="{StaticResource GenericToolTipLight}"/>
-                                                </Label.ToolTip>
-                                                <Label.Content>
-                                                    <fa:ImageAwesome Width="15" 
-                                                                     Height="15" 
-                                                                     VerticalAlignment="Bottom" 
-                                                                     HorizontalAlignment="Left" 
-                                                                     Icon="QuestionCircleOutline" 
-                                                                     Foreground="{StaticResource PreferencesWindowFontColor}"/>
-                                                </Label.Content>
+                                                <Image
+                                                   Margin="5,3,0,0"
+                                                   Width="14"
+                                                   Height="14"
+                                                   HorizontalAlignment="Center"
+                                                   VerticalAlignment="Center"
+                                                   Style="{StaticResource QuestionIcon}"
+                                                   ToolTipService.ShowDuration="30000">
+                                                        <Image.ToolTip>
+                                                            <ToolTip Content="{x:Static p:Resources.PreferencesViewTrustWarningTooltipText}" Style="{StaticResource GenericToolTipLight}"/>
+                                                        </Image.ToolTip>
+                                                    </Image>
                                             </Label>
                                         </StackPanel>
                                     </Grid>
diff --git a/src/WorkspaceDependencyViewExtension/WorkspaceDependencyView.xaml.cs b/src/WorkspaceDependencyViewExtension/WorkspaceDependencyView.xaml.cs
index 20fbae6a6d6..0f6912f0dce 100644
--- a/src/WorkspaceDependencyViewExtension/WorkspaceDependencyView.xaml.cs
+++ b/src/WorkspaceDependencyViewExtension/WorkspaceDependencyView.xaml.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Drawing;
@@ -137,9 +137,9 @@ internal void DependencyRegen(WorkspaceModel ws, bool forceCompute = false)
             RestartBanner.Visibility = Visibility.Hidden;
             ws.ForceComputeWorkspaceReferences = forceCompute;
 
-            var packageDependencies = ws.NodeLibraryDependencies.Where(d => d is PackageDependencyInfo).ToList();
-            var localDefinitions = ws.NodeLocalDefinitions.Where(d => d is DependencyInfo).ToList();
-            var externalFiles = ws.ExternalFiles.Where(d => d is DependencyInfo).ToList();
+            var packageDependencies = ws.NodeLibraryDependencies?.Where(d => d is PackageDependencyInfo).ToList();
+            var localDefinitions = ws.NodeLocalDefinitions?.Where(d => d is DependencyInfo).ToList();
+            var externalFiles = ws.ExternalFiles?.Where(d => d is DependencyInfo).ToList();
 
             foreach (DependencyInfo info in localDefinitions)
             {
@@ -187,9 +187,16 @@ internal void DependencyRegen(WorkspaceModel ws, bool forceCompute = false)
                 foreach (var package in dependencyViewExtension.pmExtension.PackageLoader.LocalPackages.Where(x => 
                 x.LoadState.ScheduledState == PackageLoadState.ScheduledTypes.ScheduledForDeletion || x.LoadState.ScheduledState == PackageLoadState.ScheduledTypes.ScheduledForUnload))
                 {
-                    (packageDependencies.FirstOrDefault(x => x.Name == package.Name) as PackageDependencyInfo).State =
+                    try
+                    {
+                        (packageDependencies.FirstOrDefault(x => x.Name == package.Name) as PackageDependencyInfo).State =
                         PackageDependencyState.RequiresRestart;
-                    hasPackageMarkedForUninstall = true;
+                        hasPackageMarkedForUninstall = true;
+                    }
+                    catch (Exception ex)
+                    {
+                        dependencyViewExtension.OnMessageLogged(LogMessage.Info(string.Format(Properties.Resources.DependencyViewExtensionErrorTemplate, $"failure to set package uninstall state |{ ex.ToString()}")));
+                    }
                 }
 
                 RestartBanner.Visibility = hasPackageMarkedForUninstall ? Visibility.Visible: Visibility.Hidden;
@@ -200,10 +207,17 @@ internal void DependencyRegen(WorkspaceModel ws, bool forceCompute = false)
             {
                 foreach (PackageDependencyInfo packageDependencyInfo in packageDependencies)
                 {
-                    var targetInfo = pmExtension.PackageLoader.LocalPackages.Where(x => x.Name == packageDependencyInfo.Name).FirstOrDefault();
-                    if (targetInfo != null)
+                    try
+                    {
+                        var targetInfo = pmExtension.PackageLoader.LocalPackages.Where(x => x.Name == packageDependencyInfo.Name).FirstOrDefault();
+                        if (targetInfo != null)
+                        {
+                            packageDependencyInfo.Path = targetInfo.RootDirectory;
+                        }
+                    }
+                    catch (Exception ex)
                     {
-                        packageDependencyInfo.Path = targetInfo.RootDirectory;
+                        dependencyViewExtension.OnMessageLogged(LogMessage.Info(string.Format(Properties.Resources.DependencyViewExtensionErrorTemplate, ex.ToString())));
                     }
                 }
             }
diff --git a/test/DynamoCoreWpfTests/AnnotationViewModelTests.cs b/test/DynamoCoreWpfTests/AnnotationViewModelTests.cs
index 48415539b11..bd518033c31 100644
--- a/test/DynamoCoreWpfTests/AnnotationViewModelTests.cs
+++ b/test/DynamoCoreWpfTests/AnnotationViewModelTests.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
@@ -154,13 +154,13 @@ public void CanUngroupNodeFromAGroup()
             var secondNode = new DSFunction(ViewModel.Model.LibraryServices.GetFunctionDescriptor("+"));
             ViewModel.Model.CurrentWorkspace.AddAndRegisterNode(secondNode, false);
 
-            //verify the node was created
+            //verify if the second node was created
             Assert.AreEqual(2, ViewModel.Model.CurrentWorkspace.Nodes.Count());
 
             //Select the node 
             DynamoSelection.Instance.Selection.Add(addNode);
           
-            //Check whether group can be created
+            //Check whether group can be ungrouped
             Assert.AreEqual(true, ViewModel.CanUngroupModel(null));
         }
 
@@ -1377,6 +1377,47 @@ public void ShowGroupContentsTest()
             Assert.IsTrue(connectorViewModel.IsCollapsed);
         }
 
+        [Test]
+        public void CanToggleVisibilityOfAllNodesInAGroup()
+        {
+            // Arrange
+            var parentGroupName = "GroupWithGroupedGroup";
+            var nestedGroupName = "GroupInsideOtherGroup";
+
+            OpenModel(@"core\annotationViewModelTests\groupsTestFile.dyn");
+
+            var parentGroupNameViewModel = ViewModel.CurrentSpaceViewModel.Annotations.FirstOrDefault(x => x.AnnotationText == parentGroupName);
+            var nestedGroupNameViewModel = ViewModel.CurrentSpaceViewModel.Annotations.FirstOrDefault(x => x.AnnotationText == nestedGroupName);
+
+            //No. of nodes in parent group with preview enabled before the toggle.
+            var parentGroupContentBefore = parentGroupNameViewModel.Nodes.OfType<NodeModel>().Where(x => x.IsVisible == true).ToList();
+            var nestedGroupContentBefore = nestedGroupNameViewModel.Nodes.OfType<NodeModel>().Where(x => x.IsVisible == true).ToList();
+
+            Assert.AreEqual(2, parentGroupContentBefore.Count);
+            Assert.AreEqual(2, nestedGroupContentBefore.Count);
+
+            //Assert HasUnsavedChanges is false
+            Assert.AreEqual(false, ViewModel.CurrentSpaceViewModel.HasUnsavedChanges);
+
+            // Act
+            parentGroupNameViewModel.ToggleIsVisibleGroupCommand.Execute(null);
+
+            // Assert
+            // Only the nodes in parent group are affected
+            var parentGroupContentAfter = parentGroupNameViewModel.Nodes.OfType<NodeModel>().Where(x => x.IsVisible == true).ToList();
+            var nestedGroupContentAfter = nestedGroupNameViewModel.Nodes.OfType<NodeModel>().Where(x => x.IsVisible == true).ToList();
+            Assert.AreEqual(0, parentGroupContentAfter.Count);
+            Assert.AreEqual(2, nestedGroupContentAfter.Count);
+
+            // Now both the groups are affected
+            nestedGroupNameViewModel.ToggleIsVisibleGroupCommand.Execute(null);
+            nestedGroupContentAfter = nestedGroupNameViewModel.Nodes.OfType<NodeModel>().Where(x => x.IsVisible == true).ToList();
+            Assert.AreEqual(0, nestedGroupContentAfter.Count);
+
+            //Assert HasUnsavedChanges is false
+            Assert.AreEqual(true, ViewModel.CurrentSpaceViewModel.HasUnsavedChanges);
+        }
+
         #endregion
     }
 }