diff --git a/extern/Helix3D/NET40/HelixToolkit.Wpf.SharpDX.dll b/extern/Helix3D/NET40/HelixToolkit.Wpf.SharpDX.dll
index 7edd6203b49..c83f5facb22 100644
Binary files a/extern/Helix3D/NET40/HelixToolkit.Wpf.SharpDX.dll and b/extern/Helix3D/NET40/HelixToolkit.Wpf.SharpDX.dll differ
diff --git a/extern/Helix3D/NET40/HelixToolkit.Wpf.dll b/extern/Helix3D/NET40/HelixToolkit.Wpf.dll
index 6f3c600afbf..125328958c0 100644
Binary files a/extern/Helix3D/NET40/HelixToolkit.Wpf.dll and b/extern/Helix3D/NET40/HelixToolkit.Wpf.dll differ
diff --git a/extern/Helix3D/NET40/HelixToolkit.dll b/extern/Helix3D/NET40/HelixToolkit.dll
index b7a769318ca..737673cb86d 100644
Binary files a/extern/Helix3D/NET40/HelixToolkit.dll and b/extern/Helix3D/NET40/HelixToolkit.dll differ
diff --git a/extern/LibG_219/LibG.AsmPreloader.Managed.dll b/extern/LibG_219/LibG.AsmPreloader.Managed.dll
index 11d48207b86..ad2977ed9f5 100644
Binary files a/extern/LibG_219/LibG.AsmPreloader.Managed.dll and b/extern/LibG_219/LibG.AsmPreloader.Managed.dll differ
diff --git a/extern/LibG_219/LibG.AsmPreloader.Unmanaged.dll b/extern/LibG_219/LibG.AsmPreloader.Unmanaged.dll
index 9fae204b944..ac085294167 100644
Binary files a/extern/LibG_219/LibG.AsmPreloader.Unmanaged.dll and b/extern/LibG_219/LibG.AsmPreloader.Unmanaged.dll differ
diff --git a/extern/LibG_219/LibG.Managed.dll b/extern/LibG_219/LibG.Managed.dll
index 9c2052f34ae..e2b0e200097 100644
Binary files a/extern/LibG_219/LibG.Managed.dll and b/extern/LibG_219/LibG.Managed.dll differ
diff --git a/extern/LibG_219/LibG.ProtoInterface.dll b/extern/LibG_219/LibG.ProtoInterface.dll
index 652101ab78a..61ce9221100 100644
Binary files a/extern/LibG_219/LibG.ProtoInterface.dll and b/extern/LibG_219/LibG.ProtoInterface.dll differ
diff --git a/extern/LibG_219/LibG.dll b/extern/LibG_219/LibG.dll
index 80e43073aed..9f3367b3e7d 100644
Binary files a/extern/LibG_219/LibG.dll and b/extern/LibG_219/LibG.dll differ
diff --git a/extern/LibG_219/LibGCore.dll b/extern/LibG_219/LibGCore.dll
index b72406d6587..2bfed0e8857 100644
Binary files a/extern/LibG_219/LibGCore.dll and b/extern/LibG_219/LibGCore.dll differ
diff --git a/extern/LibG_220/LibG.AsmPreloader.Managed.dll b/extern/LibG_220/LibG.AsmPreloader.Managed.dll
index 7b064a78cec..ad2977ed9f5 100644
Binary files a/extern/LibG_220/LibG.AsmPreloader.Managed.dll and b/extern/LibG_220/LibG.AsmPreloader.Managed.dll differ
diff --git a/extern/LibG_220/LibG.AsmPreloader.Unmanaged.dll b/extern/LibG_220/LibG.AsmPreloader.Unmanaged.dll
index d9dd3a86047..e85f07b352c 100644
Binary files a/extern/LibG_220/LibG.AsmPreloader.Unmanaged.dll and b/extern/LibG_220/LibG.AsmPreloader.Unmanaged.dll differ
diff --git a/extern/LibG_220/LibG.Managed.dll b/extern/LibG_220/LibG.Managed.dll
index db15c305583..b34feffb5db 100644
Binary files a/extern/LibG_220/LibG.Managed.dll and b/extern/LibG_220/LibG.Managed.dll differ
diff --git a/extern/LibG_220/LibG.ProtoInterface.dll b/extern/LibG_220/LibG.ProtoInterface.dll
index 98fd1b545c3..6d741018877 100644
Binary files a/extern/LibG_220/LibG.ProtoInterface.dll and b/extern/LibG_220/LibG.ProtoInterface.dll differ
diff --git a/extern/LibG_220/LibG.dll b/extern/LibG_220/LibG.dll
index 739ac451bbb..7f003321480 100644
Binary files a/extern/LibG_220/LibG.dll and b/extern/LibG_220/LibG.dll differ
diff --git a/extern/LibG_220/LibGCore.dll b/extern/LibG_220/LibGCore.dll
index db59d199238..b4bea2ac398 100644
Binary files a/extern/LibG_220/LibGCore.dll and b/extern/LibG_220/LibGCore.dll differ
diff --git a/extern/LibG_221/LibG.AsmPreloader.Managed.dll b/extern/LibG_221/LibG.AsmPreloader.Managed.dll
index 7b064a78cec..ad2977ed9f5 100644
Binary files a/extern/LibG_221/LibG.AsmPreloader.Managed.dll and b/extern/LibG_221/LibG.AsmPreloader.Managed.dll differ
diff --git a/extern/LibG_221/LibG.AsmPreloader.Unmanaged.dll b/extern/LibG_221/LibG.AsmPreloader.Unmanaged.dll
index 2bd9e2c8509..1cee605a90b 100644
Binary files a/extern/LibG_221/LibG.AsmPreloader.Unmanaged.dll and b/extern/LibG_221/LibG.AsmPreloader.Unmanaged.dll differ
diff --git a/extern/LibG_221/LibG.Managed.dll b/extern/LibG_221/LibG.Managed.dll
index da14f1950c0..31aa72b8321 100644
Binary files a/extern/LibG_221/LibG.Managed.dll and b/extern/LibG_221/LibG.Managed.dll differ
diff --git a/extern/LibG_221/LibG.ProtoInterface.dll b/extern/LibG_221/LibG.ProtoInterface.dll
index 2c23c8039a5..b6d0af81152 100644
Binary files a/extern/LibG_221/LibG.ProtoInterface.dll and b/extern/LibG_221/LibG.ProtoInterface.dll differ
diff --git a/extern/LibG_221/LibG.dll b/extern/LibG_221/LibG.dll
index 436617ce6c9..e9494834160 100644
Binary files a/extern/LibG_221/LibG.dll and b/extern/LibG_221/LibG.dll differ
diff --git a/extern/LibG_221/LibGCore.dll b/extern/LibG_221/LibGCore.dll
index 876ef793e61..ab5f5179380 100644
Binary files a/extern/LibG_221/LibGCore.dll and b/extern/LibG_221/LibGCore.dll differ
diff --git a/extern/ProtoGeometry/ProtoGeometry.XML b/extern/ProtoGeometry/ProtoGeometry.XML
index eee743c4b85..64685f0fe12 100644
--- a/extern/ProtoGeometry/ProtoGeometry.XML
+++ b/extern/ProtoGeometry/ProtoGeometry.XML
@@ -334,19 +334,19 @@
         <member name="M:Autodesk.DesignScript.Geometry.GraphicDataProvider.GetGraphicItems(System.Object)">
             <notranslation>true</notranslation>
         </member>
-        <member name="M:Autodesk.DesignScript.Geometry.GraphicDataProvider.Tessellate(System.Collections.Generic.List{System.Object},Autodesk.DesignScript.Interfaces.IRenderPackage,System.Double)">
+        <member name="M:Autodesk.DesignScript.Geometry.GraphicDataProvider.Tessellate(System.Collections.Generic.List{System.Object},Autodesk.DesignScript.Interfaces.IRenderPackage,Autodesk.DesignScript.Interfaces.TessellationParameters)">
             <notranslation>true</notranslation>
         </member>
         <member name="M:Autodesk.DesignScript.Geometry.GeometryGraphicItem.#ctor(Autodesk.DesignScript.Geometry.DesignScriptEntity)">
             <notranslation>true</notranslation>
         </member>
-        <member name="M:Autodesk.DesignScript.Geometry.GeometryGraphicItem.Tessellate(Autodesk.DesignScript.Interfaces.IRenderPackage,System.Double,System.Int32)">
+        <member name="M:Autodesk.DesignScript.Geometry.GeometryGraphicItem.Tessellate(Autodesk.DesignScript.Interfaces.IRenderPackage,Autodesk.DesignScript.Interfaces.TessellationParameters)">
             <notranslation>true</notranslation>
         </member>
         <member name="F:Autodesk.DesignScript.Geometry.DesignScriptEntity.Tags">
             <notranslation>true</notranslation>
         </member>
-        <member name="M:Autodesk.DesignScript.Geometry.DesignScriptEntity.Tessellate(Autodesk.DesignScript.Interfaces.IRenderPackage,System.Double,System.Int32)">
+        <member name="M:Autodesk.DesignScript.Geometry.DesignScriptEntity.Tessellate(Autodesk.DesignScript.Interfaces.IRenderPackage,Autodesk.DesignScript.Interfaces.TessellationParameters)">
             <notranslation>true</notranslation>
         </member>
         <member name="M:Autodesk.DesignScript.Geometry.DesignScriptEntity.Dispose">
@@ -557,20 +557,19 @@
             <returns></returns>
         </member>
         <member name="M:Autodesk.DesignScript.Geometry.Geometry.ExportToSAT(System.String)">
-             <summary>
-             Exports the specified geometry to the given SAT file path
-             </summary>
-             <param name="filePath">The name of the file to export the geometry to</param>
-             <returns></returns>
-            WARNING: non-ascii characters are not supported in file nams.
+            <summary>
+            Exports the specified geometry to the given SAT file path
+            </summary>
+            <param name="filePath">The name of the file to export the geometry to</param>
+            <returns></returns>
         </member>
         <member name="M:Autodesk.DesignScript.Geometry.Geometry.ExportToSAT(System.String,System.Double)">
-             <summary>
-             Exports the specified geometry to the given SAT file path
-             </summary>
-             <param name="filePath">The name of the file to export the geometry to</param>
-             <returns></returns>
-            WARNING: non-ascii characters are not supported in file nams.
+            <summary>
+            Exports the specified geometry to the given SAT file path
+            </summary>
+            <param name="filePath">The name of the file to export the geometry to</param>
+            <param name="unitsMM">The units to use</param>
+            <returns></returns>
         </member>
         <member name="M:Autodesk.DesignScript.Geometry.Geometry.ExportToSAT(System.Collections.Generic.IEnumerable{Autodesk.DesignScript.Geometry.Geometry},System.String)">
             <summary>
diff --git a/extern/ProtoGeometry/ProtoGeometry.dll b/extern/ProtoGeometry/ProtoGeometry.dll
index 140d30102e9..b4fd564beef 100644
Binary files a/extern/ProtoGeometry/ProtoGeometry.dll and b/extern/ProtoGeometry/ProtoGeometry.dll differ
diff --git a/extern/ProtoGeometry/ProtoInterface.dll b/extern/ProtoGeometry/ProtoInterface.dll
index 92b1625510c..406326ef3f5 100644
Binary files a/extern/ProtoGeometry/ProtoInterface.dll and b/extern/ProtoGeometry/ProtoInterface.dll differ
diff --git a/extern/ProtoGeometry/en-US/ProtoGeometry.resources.dll b/extern/ProtoGeometry/en-US/ProtoGeometry.resources.dll
index 1084cd71e06..0accd6678ab 100644
Binary files a/extern/ProtoGeometry/en-US/ProtoGeometry.resources.dll and b/extern/ProtoGeometry/en-US/ProtoGeometry.resources.dll differ
diff --git a/src/Dynamo.All.2013.sln b/src/Dynamo.All.2013.sln
index 560b7c4050f..7ead5849a17 100644
--- a/src/Dynamo.All.2013.sln
+++ b/src/Dynamo.All.2013.sln
@@ -180,11 +180,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SampleLibraryZeroTouch", "L
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SampleLibraryUI", "Libraries\Samples\SampleLibraryUI\SampleLibraryUI.csproj", "{0A4B4EEA-8FAB-4AC8-90D4-27DBC5B0CF2A}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{4466E6F6-F644-43AB-96B3-5ECE1622E711}"
-	ProjectSection(SolutionItems) = preProject
-		Config.xml = Config.xml
-	EndProjectSection
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SystemTestServices", "..\test\Libraries\SystemTestServices\SystemTestServices.csproj", "{89563CD0-509B-40A5-8728-9D3EC6FE8410}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SampleLibraryTests", "Libraries\Samples\SampleLibraryTests\SampleLibraryTests.csproj", "{933B8108-4E74-470A-86C7-4B7F633115B9}"
@@ -207,6 +202,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GeometryUIWpf", "Libraries\
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Display", "Libraries\Display\Display.csproj", "{A50C198C-DA6E-4081-BC53-0F44D287F207}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DisplayTests", "..\test\Libraries\DisplayTests\DisplayTests.csproj", "{F8D2E3E5-4505-4463-9367-2EB2629D7DCD}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -445,6 +442,10 @@ Global
 		{A50C198C-DA6E-4081-BC53-0F44D287F207}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A50C198C-DA6E-4081-BC53-0F44D287F207}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A50C198C-DA6E-4081-BC53-0F44D287F207}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F8D2E3E5-4505-4463-9367-2EB2629D7DCD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F8D2E3E5-4505-4463-9367-2EB2629D7DCD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F8D2E3E5-4505-4463-9367-2EB2629D7DCD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F8D2E3E5-4505-4463-9367-2EB2629D7DCD}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -507,5 +508,6 @@ Global
 		{E674F1A1-BE83-475A-9CC9-F55CADBEC448} = {FA7BE306-A3B0-45FA-9D87-0C69E6932C13}
 		{C068DE76-0651-4F6C-8807-B90EF749D104} = {FA7BE306-A3B0-45FA-9D87-0C69E6932C13}
 		{A50C198C-DA6E-4081-BC53-0F44D287F207} = {FA7BE306-A3B0-45FA-9D87-0C69E6932C13}
+		{F8D2E3E5-4505-4463-9367-2EB2629D7DCD} = {0E492D35-2310-4849-9694-A2A53C09F21B}
 	EndGlobalSection
 EndGlobal
diff --git a/src/DynamoCore/Core/PreferenceSettings.cs b/src/DynamoCore/Core/PreferenceSettings.cs
index 21c003e7308..6e46b32b89e 100644
--- a/src/DynamoCore/Core/PreferenceSettings.cs
+++ b/src/DynamoCore/Core/PreferenceSettings.cs
@@ -149,6 +149,11 @@ public int MaxNumRecentFiles
         public bool PackageDownloadTouAccepted { get; set; }
 
         /// <summary>
+        /// Indicates whether surface and solid edges will 
+        /// be rendered.
+        /// </summary>
+        public bool ShowEdges { get; set; }
+
         /// Indicates the default state of the "Open in Manual Mode"
         /// checkbox in OpenFileDialog
         /// </summary>
@@ -175,6 +180,7 @@ public PreferenceSettings()
             UseHardwareAcceleration = true;
             PackageDownloadTouAccepted = false;
             maxNumRecentFiles = DefaultMaxNumRecentFiles;
+            ShowEdges = false;
             OpenFileInManualExecutionMode = false;
 
             BackupInterval = 60000; // 1 minute
diff --git a/src/DynamoCore/Core/Threading/UpdateRenderPackageAsyncTask.cs b/src/DynamoCore/Core/Threading/UpdateRenderPackageAsyncTask.cs
index b63a734d30e..fffec0da755 100644
--- a/src/DynamoCore/Core/Threading/UpdateRenderPackageAsyncTask.cs
+++ b/src/DynamoCore/Core/Threading/UpdateRenderPackageAsyncTask.cs
@@ -41,7 +41,6 @@ class UpdateRenderPackageAsyncTask : AsyncTask
         private const byte DefB = 130;
         private const byte DefA = 255;
         private const byte MidTone = 180;
-        private bool renderEdges = false;
 
         #region Class Data Members and Properties
 
@@ -169,16 +168,16 @@ private void GetRenderPackagesFromMirrorData(MirrorData mirrorData, bool display
 
                 try
                 {
-                    graphicItem.Tessellate(package, -1.0, factory.MaxTessellationDivisions);
+                    graphicItem.Tessellate(package, factory.TessellationParameters);
 
-                    if (renderEdges)
+                    if (factory.TessellationParameters.ShowEdges)
                     {
                         var surf = graphicItem as Surface;
                         if (surf != null)
                         {
                             foreach (var curve in surf.PerimeterCurves())
                             {
-                                curve.Tessellate(package, -1.0, factory.MaxTessellationDivisions);
+                                curve.Tessellate(package, factory.TessellationParameters);
                                 curve.Dispose();
                             }
                         }
@@ -188,7 +187,7 @@ private void GetRenderPackagesFromMirrorData(MirrorData mirrorData, bool display
                         {
                             foreach (var geom in solid.Edges.Select(edge => edge.CurveGeometry))
                             {
-                                geom.Tessellate(package, -1.0, factory.MaxTessellationDivisions);
+                                geom.Tessellate(package, factory.TessellationParameters);
                                 geom.Dispose();
                             }
                         }
diff --git a/src/DynamoCore/Interfaces/IRenderPackageFactory.cs b/src/DynamoCore/Interfaces/IRenderPackageFactory.cs
index 1b480ab304b..0e853c56fa1 100644
--- a/src/DynamoCore/Interfaces/IRenderPackageFactory.cs
+++ b/src/DynamoCore/Interfaces/IRenderPackageFactory.cs
@@ -1,4 +1,5 @@
 using Autodesk.DesignScript.Interfaces;
+using Dynamo.Annotations;
 
 namespace Dynamo.Interfaces
 {
@@ -10,11 +11,7 @@ namespace Dynamo.Interfaces
     /// </summary>
     public interface IRenderPackageFactory
     {
-        /// <summary>
-        /// The maximum number of subdivisions of a surface for tesselation.
-        /// Used only by methods that tessellate BReps.
-        /// </summary>
-        int MaxTessellationDivisions { get; set; }
+        TessellationParameters TessellationParameters { get; set; }
 
         /// <summary>
         /// Create an IRenderPackage object of the type manufactured by this factory.
diff --git a/src/DynamoCore/Library/LibraryServices.cs b/src/DynamoCore/Library/LibraryServices.cs
index 149f831dd9a..5347eb155d0 100644
--- a/src/DynamoCore/Library/LibraryServices.cs
+++ b/src/DynamoCore/Library/LibraryServices.cs
@@ -1,16 +1,12 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.IO;
 using System.Linq;
-using System.Text;
 using System.Xml;
-using System.Xml.Linq;
 
 using Dynamo.Interfaces;
 using Dynamo.Library;
 using Dynamo.Utilities;
-using DynamoUtilities;
 
 using ProtoCore.AST.AssociativeAST;
 using ProtoCore.BuildData;
@@ -18,10 +14,10 @@
 using ProtoCore.Utils;
 using ProtoFFI;
 
-using RestSharp;
 
 using Operator = ProtoCore.DSASM.Operator;
 using ProtoCore;
+using ProtoCore.Namespace;
 
 namespace Dynamo.DSEngine
 {
@@ -820,7 +816,11 @@ private void ImportProcedure(string library, ProcedureNode proc)
                             defaultArgumentNode = binaryExpr.RightNode;
                         }
                     }
-
+                    if (defaultArgumentNode != null)
+                    {
+                        var rewriter = new ElementRewriter(LibraryManagementCore.ClassTable, LibraryManagementCore.BuildStatus.LogSymbolConflictWarning);
+                        defaultArgumentNode = defaultArgumentNode.Accept(rewriter);
+                    }
                     return new TypedParameter(arg.Name, argType, defaultArgumentNode);
                 }).ToList();
 
diff --git a/src/DynamoCore/Nodes/DummyNode.cs b/src/DynamoCore/Nodes/DummyNode.cs
index cb034d2b7e6..7cbb843e81c 100644
--- a/src/DynamoCore/Nodes/DummyNode.cs
+++ b/src/DynamoCore/Nodes/DummyNode.cs
@@ -48,6 +48,10 @@ public DummyNode(int inputCount, int outputCount, string legacyName, XmlElement
             var helper = new XmlElementHelper(originalElement);
             X = helper.ReadDouble("x", 0.0);
             Y = helper.ReadDouble("y", 0.0);
+
+            //Take the GUID from the old node (dummy nodes should have their
+            //GUID's. This will allow the Groups to work as expected. MAGN-7568)
+            GUID = helper.ReadGuid("guid", this.GUID);
         }
 
         private void LoadNode(XmlNode nodeElement)
diff --git a/src/DynamoCore/Rendering/DefaultRenderPackageFactory.cs b/src/DynamoCore/Rendering/DefaultRenderPackageFactory.cs
index d1c2bd7d02e..29388a8adfe 100644
--- a/src/DynamoCore/Rendering/DefaultRenderPackageFactory.cs
+++ b/src/DynamoCore/Rendering/DefaultRenderPackageFactory.cs
@@ -9,11 +9,14 @@ namespace Dynamo
 {
     public class DefaultRenderPackageFactory : IRenderPackageFactory
     {
-        public int MaxTessellationDivisions { get; set; }
+        public TessellationParameters TessellationParameters { get; set; }
 
         public DefaultRenderPackageFactory()
         {
-            MaxTessellationDivisions = 32;
+            TessellationParameters = new TessellationParameters()
+            {
+                MaxTessellationDivisions = 32
+            };
         }
 
         public IRenderPackage CreateRenderPackage()
diff --git a/src/DynamoCore/Utilities/Configurations.cs b/src/DynamoCore/Utilities/Configurations.cs
index 61c8f03e73d..7931d030a43 100644
--- a/src/DynamoCore/Utilities/Configurations.cs
+++ b/src/DynamoCore/Utilities/Configurations.cs
@@ -228,6 +228,12 @@ public class Configurations
 
         #endregion
 
+        #region InCanvasSearch
+
+        public const double InCanvasSearchTextBoxHeight = 40.0;
+
+        #endregion
+
         #region Backup
 
         public static string BackupFileNamePrefix = "backup";
diff --git a/src/DynamoCoreWpf/Controls/IncanvasSearchControl.xaml b/src/DynamoCoreWpf/Controls/IncanvasSearchControl.xaml
index 7014251c358..eb3c686698e 100644
--- a/src/DynamoCoreWpf/Controls/IncanvasSearchControl.xaml
+++ b/src/DynamoCoreWpf/Controls/IncanvasSearchControl.xaml
@@ -6,10 +6,11 @@
              xmlns:controls="clr-namespace:Dynamo.Controls"
              xmlns:views="clr-namespace:Dynamo.UI.Views"
              xmlns:ui="clr-namespace:Dynamo.UI"
+             xmlns:uicontrols="clr-namespace:Dynamo.UI.Controls"
              xmlns:resx="clr-namespace:Dynamo.Properties;assembly=DynamoCore"
              xmlns:viewmodels="clr-namespace:Dynamo.ViewModels;assembly=DynamoCoreWpf"
              mc:Ignorable="d"
-             Width="250"
+             MinWidth="250"
              IsVisibleChanged="OnInCanvasSearchControlVisibilityChanged">
     <UserControl.Resources>
         <ResourceDictionary>
@@ -24,6 +25,10 @@
                    TargetType="{x:Type ListBoxItem}">
                 <EventSetter Event="PreviewMouseLeftButtonUp"
                              Handler="OnMouseLeftButtonUp" />
+                <EventSetter Event="MouseEnter"
+                             Handler="OnMouseEnter" />
+                <EventSetter Event="MouseLeave"
+                             Handler="OnMouseLeave" />
             </Style>
             
             <Style TargetType="{x:Type ScrollViewer}"
@@ -152,5 +157,16 @@
                 </Style>
             </Border.Style>
         </Border>
+
+
+        <Border Margin="-3,0,-3,0">
+            <Popup StaysOpen="True"
+                   AllowsTransparency="True"
+                   Placement="Right"
+                   x:Name="toolTipPopup">
+                <uicontrols:ToolTipWindow />
+            </Popup>
+        </Border>
+
     </Grid>
 </UserControl>
diff --git a/src/DynamoCoreWpf/Controls/IncanvasSearchControl.xaml.cs b/src/DynamoCoreWpf/Controls/IncanvasSearchControl.xaml.cs
index 1bec23263c2..93618948a05 100644
--- a/src/DynamoCoreWpf/Controls/IncanvasSearchControl.xaml.cs
+++ b/src/DynamoCoreWpf/Controls/IncanvasSearchControl.xaml.cs
@@ -94,6 +94,22 @@ private void ExecuteSearchElement(ListBoxItem listBoxItem)
             }
         }
 
+        private void OnMouseEnter(object sender, MouseEventArgs e)
+        {
+            FrameworkElement fromSender = sender as FrameworkElement;
+            if (fromSender == null) return;
+
+            toolTipPopup.DataContext = fromSender.DataContext;
+            toolTipPopup.IsOpen = true;
+
+        }
+
+        private void OnMouseLeave(object sender, MouseEventArgs e)
+        {
+            toolTipPopup.DataContext = null;
+            toolTipPopup.IsOpen = false;
+        }
+
         private void OnInCanvasSearchControlVisibilityChanged(object sender, DependencyPropertyChangedEventArgs e)
         {
             // If visibility  is false, then stop processing it.
diff --git a/src/DynamoCoreWpf/DynamoCoreWpf.csproj b/src/DynamoCoreWpf/DynamoCoreWpf.csproj
index 90a1dbb0dd4..37d5f3ded26 100644
--- a/src/DynamoCoreWpf/DynamoCoreWpf.csproj
+++ b/src/DynamoCoreWpf/DynamoCoreWpf.csproj
@@ -227,6 +227,7 @@
     <Compile Include="NodeViewCustomization\NodeViewCustomizations\VariableInputNodeViewCustomization.cs" />
     <Compile Include="ViewModels\Search\SearchCategory.cs" />
     <Compile Include="ViewModels\Search\SearchMemberGroup.cs" />
+    <Compile Include="ViewModels\RenderPackageFactoryViewModel.cs" />
     <Compile Include="Views\About\AboutWindow.xaml.cs">
       <DependentUpon>AboutWindow.xaml</DependentUpon>
     </Compile>
diff --git a/src/DynamoCoreWpf/Interfaces/IVisualizationManager.cs b/src/DynamoCoreWpf/Interfaces/IVisualizationManager.cs
index b3df5973399..baa50b9ee37 100644
--- a/src/DynamoCoreWpf/Interfaces/IVisualizationManager.cs
+++ b/src/DynamoCoreWpf/Interfaces/IVisualizationManager.cs
@@ -81,5 +81,9 @@ public interface IVisualizationManager : IDisposable
         /// An event triggered when a workspace is closed / open.
         /// </summary>
         event Action InitializeGeomtery;
+
+        /// Update all Node RenderPackages and raise notification.
+        /// </summary>
+        void UpdateAllNodeVisualsAndNotify();
     }
 }
diff --git a/src/DynamoCoreWpf/Properties/Resources.Designer.cs b/src/DynamoCoreWpf/Properties/Resources.Designer.cs
index eb8f016dcc5..27239c8d672 100644
--- a/src/DynamoCoreWpf/Properties/Resources.Designer.cs
+++ b/src/DynamoCoreWpf/Properties/Resources.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18408
+//     Runtime Version:4.0.30319.34014
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -150,6 +150,24 @@ public static string Automatic {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Browse....
+        /// </summary>
+        public static string BrowserNodeButtonLabel {
+            get {
+                return ResourceManager.GetString("BrowserNodeButtonLabel", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to No file selected..
+        /// </summary>
+        public static string BrowserNodeNoFileSelected {
+            get {
+                return ResourceManager.GetString("BrowserNodeNoFileSelected", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Loading....
         /// </summary>
@@ -1533,6 +1551,24 @@ public static string DynamoViewSettingShowRunPreview {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Show Edges.
+        /// </summary>
+        public static string DynamoViewSettingsMenuShowEdges {
+            get {
+                return ResourceManager.GetString("DynamoViewSettingsMenuShowEdges", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Visualization Settings.
+        /// </summary>
+        public static string DynamoViewSettingsMenuVisualizationSettings {
+            get {
+                return ResourceManager.GetString("DynamoViewSettingsMenuVisualizationSettings", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Export Workspace As Image.
         /// </summary>
@@ -3884,6 +3920,15 @@ public static string StartPageWhatsNew {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Edit....
+        /// </summary>
+        public static string StringInputNodeEditMenu {
+            get {
+                return ResourceManager.GetString("StringInputNodeEditMenu", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to I Accept.
         /// </summary>
@@ -4021,6 +4066,15 @@ public static string Watch3DViewContextMenuZoomToFit {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Show Raw Data.
+        /// </summary>
+        public static string WatchNodeRawDataMenu {
+            get {
+                return ResourceManager.GetString("WatchNodeRawDataMenu", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to DLL.
         /// </summary>
diff --git a/src/DynamoCoreWpf/Properties/Resources.en-US.resx b/src/DynamoCoreWpf/Properties/Resources.en-US.resx
index 3736fbb8935..a4a2851a42d 100644
--- a/src/DynamoCoreWpf/Properties/Resources.en-US.resx
+++ b/src/DynamoCoreWpf/Properties/Resources.en-US.resx
@@ -1682,7 +1682,22 @@ Do you want to install the latest Dynamo update?</value>
   <data name="ZeroTouchTypeShortString" xml:space="preserve">
     <value>DLL</value>
   </data>
+  <data name="DynamoViewSettingsMenuShowEdges" xml:space="preserve">
+    <value>Show Edges</value>
+  </data>
+  <data name="DynamoViewSettingsMenuVisualizationSettings" xml:space="preserve">
+    <value>Visualization Settings</value>
+  </data>
   <data name="FileDialogManualMode" xml:space="preserve">
     <value>Open in Manual Execution Mode</value>
   </data>
+  <data name="BrowserNodeButtonLabel" xml:space="preserve">
+    <value>Browse...</value>
+  </data>
+  <data name="StringInputNodeEditMenu" xml:space="preserve">
+    <value>Edit...</value>
+  </data>
+  <data name="WatchNodeRawDataMenu" xml:space="preserve">
+    <value>Show Raw Data</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/DynamoCoreWpf/Properties/Resources.resx b/src/DynamoCoreWpf/Properties/Resources.resx
index 3736fbb8935..1d6015be27f 100644
--- a/src/DynamoCoreWpf/Properties/Resources.resx
+++ b/src/DynamoCoreWpf/Properties/Resources.resx
@@ -1682,7 +1682,25 @@ Do you want to install the latest Dynamo update?</value>
   <data name="ZeroTouchTypeShortString" xml:space="preserve">
     <value>DLL</value>
   </data>
+  <data name="DynamoViewSettingsMenuShowEdges" xml:space="preserve">
+    <value>Show Edges</value>
+  </data>
+  <data name="DynamoViewSettingsMenuVisualizationSettings" xml:space="preserve">
+    <value>Visualization Settings</value>
+  </data>
   <data name="FileDialogManualMode" xml:space="preserve">
     <value>Open in Manual Execution Mode</value>
   </data>
+  <data name="BrowserNodeButtonLabel" xml:space="preserve">
+    <value>Browse...</value>
+  </data>
+  <data name="BrowserNodeNoFileSelected" xml:space="preserve">
+    <value>No file selected.</value>
+  </data>
+  <data name="StringInputNodeEditMenu" xml:space="preserve">
+    <value>Edit...</value>
+  </data>
+  <data name="WatchNodeRawDataMenu" xml:space="preserve">
+    <value>Show Raw Data</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/DynamoCoreWpf/Rendering/HelixRenderPackage.cs b/src/DynamoCoreWpf/Rendering/HelixRenderPackage.cs
index 31e0fb2a882..735c6c52d45 100644
--- a/src/DynamoCoreWpf/Rendering/HelixRenderPackage.cs
+++ b/src/DynamoCoreWpf/Rendering/HelixRenderPackage.cs
@@ -16,11 +16,14 @@ public class HelixRenderPackageFactory : IRenderPackageFactory
     {
         private const int MaxTessellationDivisionsDefault = 128;
 
-        public int MaxTessellationDivisions { get; set; }
+        public TessellationParameters TessellationParameters { get; set; }
 
         public HelixRenderPackageFactory()
         {
-            MaxTessellationDivisions = MaxTessellationDivisionsDefault;
+            TessellationParameters = new TessellationParameters()
+            {
+                MaxTessellationDivisions = MaxTessellationDivisionsDefault
+            };
         }
 
         public IRenderPackage CreateRenderPackage()
diff --git a/src/DynamoCoreWpf/UI/Converters.cs b/src/DynamoCoreWpf/UI/Converters.cs
index 0de871a6522..fbd468a74c1 100644
--- a/src/DynamoCoreWpf/UI/Converters.cs
+++ b/src/DynamoCoreWpf/UI/Converters.cs
@@ -2286,5 +2286,24 @@ public object ConvertBack(object value, Type targetType, object parameter, Cultu
             {
                 throw new NotImplementedException();
             }
-        }    
-}
+        }
+
+        /// <summary>
+        /// Converter is used in WorkspaceView. It makes context menu longer.
+        /// Since context menu includes now inCanvasSearch, it should be align according its' new height.
+        /// </summary>
+        public class WorkspaceContextMenuHeightConverter : IValueConverter
+        {
+            public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+            {
+                double actualContextMenuHeight = (double)value;
+
+                return actualContextMenuHeight + Configurations.InCanvasSearchTextBoxHeight;
+            }
+
+            public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
+            {
+                throw new NotImplementedException();
+            }
+        }
+    }
diff --git a/src/DynamoCoreWpf/UI/Themes/Modern/DynamoConverters.xaml b/src/DynamoCoreWpf/UI/Themes/Modern/DynamoConverters.xaml
index 5b9b337cfef..79667a72265 100644
--- a/src/DynamoCoreWpf/UI/Themes/Modern/DynamoConverters.xaml
+++ b/src/DynamoCoreWpf/UI/Themes/Modern/DynamoConverters.xaml
@@ -150,4 +150,5 @@
     <controls:ElementTypeToShortConverter x:Key="ElementTypeToShortConverter" />
     <controls:GroupTitleVisibilityConverter x:Key="GroupTitleVisibilityConverter"/>
     <controls:LibraryViewModeToBoolConverter x:Key="LibraryViewModeToBoolConverter" />
+    <controls:WorkspaceContextMenuHeightConverter x:Key="WorkspaceContextMenuHeightConverter" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs b/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs
index ac37bb81a3f..cb1ed2c53e8 100644
--- a/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs
+++ b/src/DynamoCoreWpf/ViewModels/Core/DynamoViewModel.cs
@@ -400,16 +400,6 @@ public string LicenseFile
             }
         }
 
-        public int MaxTessellationDivisions
-        {
-            get { return VisualizationManager.RenderPackageFactory.MaxTessellationDivisions; }
-            set
-            {
-                VisualizationManager.RenderPackageFactory.MaxTessellationDivisions = value;
-                model.OnRequestsRedraw(this, EventArgs.Empty);
-            }
-        }
-
         public bool VerboseLogging
         {
             get { return model.DebugSettings.VerboseLogging; }
@@ -468,6 +458,8 @@ public bool ShowWatchSettingsControl
             }
         }
 
+        public RenderPackageFactoryViewModel RenderPackageFactoryViewModel { get; set; }
+
         #endregion
 
         public struct StartConfiguration
@@ -549,6 +541,21 @@ protected DynamoViewModel(StartConfiguration startConfiguration)
             WatchIsResizable = false;
 
             SubscribeDispatcherHandlers();
+
+            RenderPackageFactoryViewModel = new RenderPackageFactoryViewModel(this.VisualizationManager.RenderPackageFactory);
+            RenderPackageFactoryViewModel.PropertyChanged += RenderPackageFactoryViewModel_PropertyChanged;
+        }
+
+        void RenderPackageFactoryViewModel_PropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            switch (e.PropertyName)
+            {
+                case "ShowEdges":
+                    Model.PreferenceSettings.ShowEdges =
+                        VisualizationManager.RenderPackageFactory.TessellationParameters.ShowEdges;
+                    break;
+            }
+            VisualizationManager.UpdateAllNodeVisualsAndNotify();
         }
 
         internal event EventHandler NodeViewReady;
@@ -575,6 +582,7 @@ protected virtual void UnsubscribeAllEvents()
             model.WorkspaceRemoved -= WorkspaceRemoved;
             DynamoSelection.Instance.Selection.CollectionChanged -= SelectionOnCollectionChanged;
             UsageReportingManager.Instance.PropertyChanged -= CollectInfoManager_PropertyChanged;
+            RenderPackageFactoryViewModel.PropertyChanged -= RenderPackageFactoryViewModel_PropertyChanged;
         }
 
         private void InitializeRecentFiles()
diff --git a/src/DynamoCoreWpf/ViewModels/PackageManager/PublishPackageViewModel.cs b/src/DynamoCoreWpf/ViewModels/PackageManager/PublishPackageViewModel.cs
index f1e298d9abc..ccc1cd12e40 100644
--- a/src/DynamoCoreWpf/ViewModels/PackageManager/PublishPackageViewModel.cs
+++ b/src/DynamoCoreWpf/ViewModels/PackageManager/PublishPackageViewModel.cs
@@ -507,7 +507,11 @@ public PublishPackageViewModel( DynamoViewModel dynamoViewModel ) : this()
 
         private void ThisPropertyChanged(object sender, PropertyChangedEventArgs e)
         {
-            if (e.PropertyName == "PackageContents") CanSubmit();
+            if (e.PropertyName == "PackageContents")
+            {
+                CanSubmit();
+               SubmitCommand.RaiseCanExecuteChanged();
+            }
         }
 
         public static PublishPackageViewModel FromLocalPackage(DynamoViewModel dynamoViewModel, Package l)
@@ -827,7 +831,7 @@ private bool CanShowAddFileDialogAndAdd()
             return true;
         }
 
-        private void AddFile(string filename)
+        internal void AddFile(string filename)
         {
             if (!File.Exists(filename)) return;
 
diff --git a/src/DynamoCoreWpf/ViewModels/RenderPackageFactoryViewModel.cs b/src/DynamoCoreWpf/ViewModels/RenderPackageFactoryViewModel.cs
new file mode 100644
index 00000000000..a71bffc48e9
--- /dev/null
+++ b/src/DynamoCoreWpf/ViewModels/RenderPackageFactoryViewModel.cs
@@ -0,0 +1,37 @@
+using Dynamo.Interfaces;
+using Dynamo.ViewModels;
+
+namespace Dynamo.Wpf.ViewModels
+{
+    public class RenderPackageFactoryViewModel : ViewModelBase
+    {
+        private readonly IRenderPackageFactory factory;
+
+        public bool ShowEdges
+        {
+            get { return factory.TessellationParameters.ShowEdges; }
+            set
+            {
+                if (factory.TessellationParameters.ShowEdges == value) return;
+                factory.TessellationParameters.ShowEdges = value;
+                RaisePropertyChanged("ShowEdges");
+            }
+        }
+
+        public int MaxTessellationDivisions
+        {
+            get { return factory.TessellationParameters.MaxTessellationDivisions; }
+            set
+            {
+                if (factory.TessellationParameters.MaxTessellationDivisions == value) return;
+                factory.TessellationParameters.MaxTessellationDivisions = value;
+                RaisePropertyChanged("MaxTessellationDivisions");
+            }
+        }
+
+        public RenderPackageFactoryViewModel(IRenderPackageFactory factory)
+        {
+            this.factory = factory;
+        }
+    }
+}
diff --git a/src/DynamoCoreWpf/ViewModels/Search/SearchViewModel.cs b/src/DynamoCoreWpf/ViewModels/Search/SearchViewModel.cs
index 28df66ddc15..e839780a7d6 100644
--- a/src/DynamoCoreWpf/ViewModels/Search/SearchViewModel.cs
+++ b/src/DynamoCoreWpf/ViewModels/Search/SearchViewModel.cs
@@ -744,9 +744,6 @@ private void PopulateSearchCategories(IEnumerable<NodeSearchElement> nodes)
             else
                 UpdateTopResult(null);
 
-            // Order found categories by name.
-            searchRootCategories = new ObservableCollection<SearchCategory>(searchRootCategories.OrderBy(x => x.Name));
-
             SortSearchCategoriesChildren();
         }
 
diff --git a/src/DynamoCoreWpf/Views/Core/DynamoView.xaml b/src/DynamoCoreWpf/Views/Core/DynamoView.xaml
index ce928ee4d22..651defb0ec5 100644
--- a/src/DynamoCoreWpf/Views/Core/DynamoView.xaml
+++ b/src/DynamoCoreWpf/Views/Core/DynamoView.xaml
@@ -597,11 +597,15 @@
                                 <Slider Width="100"
                                         Minimum="12"
                                         Maximum="512"
-                                        Value="{Binding MaxTessellationDivisions, Mode=TwoWay}"></Slider>
+                                        Value="{Binding Path=RenderPackageFactoryViewModel.MaxTessellationDivisions, Mode=TwoWay}"></Slider>
                                 <TextBlock Text="{x:Static p:Resources.DynamoViewSettingMenuHighRenderPrecision}"
                                            Margin="10,0,0,0"></TextBlock>
                             </StackPanel>
                         </MenuItem>
+                        <MenuItem Focusable="False"
+                                  IsCheckable="True"
+                                  IsChecked="{Binding Path=RenderPackageFactoryViewModel.ShowEdges, Mode=TwoWay}"
+                                  Header="{x:Static p:Resources.DynamoViewSettingsMenuShowEdges}"></MenuItem>
                     </MenuItem>
 
                     <MenuItem Header="{x:Static p:Resources.DynamoViewHelpMenu}"
diff --git a/src/DynamoCoreWpf/Views/Core/WorkspaceView.xaml b/src/DynamoCoreWpf/Views/Core/WorkspaceView.xaml
index f14a4e1e8a9..48228e7ad9a 100644
--- a/src/DynamoCoreWpf/Views/Core/WorkspaceView.xaml
+++ b/src/DynamoCoreWpf/Views/Core/WorkspaceView.xaml
@@ -34,10 +34,13 @@
                 <Setter.Value>
                     <ControlTemplate TargetType="{x:Type ContextMenu}">
                         <StackPanel Margin="8,0,8,8"
-                                    Width="250">
-                            <ui:InCanvasSearchControl DataContext="{Binding InCanvasSearchViewModel}" />
+                                    Name="ContextMenuPanel"
+                                    Height="{Binding ElementName=MenuItems, Path=ActualHeight, 
+                                                     Converter={StaticResource WorkspaceContextMenuHeightConverter}}">
+                            <ui:InCanvasSearchControl DataContext="{Binding InCanvasSearchViewModel}"
+                                                      Width="{Binding ElementName=ContextMenuPanel, Path=ActualWidth}" />
                             <Border BorderThickness="1"
-                                    Name="Border"
+                                    Name="MenuItems"
                                     Background="White"
                                     BorderBrush="#bbbbbb"
                                     Padding="0,3,0,3"
diff --git a/src/DynamoCoreWpf/Views/PackageManager/PublishPackageView.xaml b/src/DynamoCoreWpf/Views/PackageManager/PublishPackageView.xaml
index 04ef829decc..b29d1a5e365 100644
--- a/src/DynamoCoreWpf/Views/PackageManager/PublishPackageView.xaml
+++ b/src/DynamoCoreWpf/Views/PackageManager/PublishPackageView.xaml
@@ -134,7 +134,7 @@
         </Border>
 
         <StackPanel Grid.Row="2" Background="#444">
-            <Button Style="{DynamicResource ResourceKey=STextButton}" Width="130" Margin="10,5" HorizontalAlignment="Right" Command="{Binding Path=SubmitCommand}" Content="{x:Static p:Resources.PublishPackage}"></Button>
+            <Button Style="{DynamicResource ResourceKey=STextButton}" Width="auto" MinWidth="130" Margin="10,5" HorizontalAlignment="Right" Command="{Binding Path=SubmitCommand}" Content="{x:Static p:Resources.PublishPackage}"></Button>
         </StackPanel>
  
         <Grid Grid.RowSpan="3" Grid.Column="1" Grid.ColumnSpan="1" Grid.Row="1">
diff --git a/src/DynamoCoreWpf/Views/Preview/Watch3DView.xaml b/src/DynamoCoreWpf/Views/Preview/Watch3DView.xaml
index 4c54dec1cdf..b57747fb4ca 100644
--- a/src/DynamoCoreWpf/Views/Preview/Watch3DView.xaml
+++ b/src/DynamoCoreWpf/Views/Preview/Watch3DView.xaml
@@ -104,8 +104,8 @@
             MouseLeftButtonDown="Watch_view_OnMouseDown" 
             ShowCoordinateSystem="False"
             RenderTechnique="{Binding RenderTechnique}"
-            Camera="{Binding Camera}" RotationSensitivity="1"
-            IsShadowMappingEnabled="{Binding ShowShadows}" 
+            Camera="{Binding Camera}" 
+            RotationSensitivity="1"
             UseDefaultGestures="False" 
             IsInertiaEnabled="False" 
             IsChangeFieldOfViewEnabled="False" 
diff --git a/src/DynamoCoreWpf/Views/Preview/Watch3DView.xaml.cs b/src/DynamoCoreWpf/Views/Preview/Watch3DView.xaml.cs
index 9a12c5a1f14..8cef761ef06 100644
--- a/src/DynamoCoreWpf/Views/Preview/Watch3DView.xaml.cs
+++ b/src/DynamoCoreWpf/Views/Preview/Watch3DView.xaml.cs
@@ -13,7 +13,6 @@
 using System.Windows.Media.Media3D;
 using Dynamo.Models;
 using Dynamo.UI;
-using Dynamo.UI.Commands;
 using Dynamo.ViewModels;
 using Dynamo.Wpf.Rendering;
 using HelixToolkit.Wpf.SharpDX;
@@ -58,14 +57,14 @@ private void NotifyPropertyChanged(string propertyName)
         private PerspectiveCamera camera;
         private Color4 selectionColor;
         private Color4 materialColor;
-        private bool showShadows;
-        private Color4 lightColor;
-        private Vector3 lightDirection;
+        private Vector3 directionalLightDirection;
+        private Color4 directionalLightColor;
         private DirectionalLight3D directionalLight;
         private Color4 defaultLineColor;
         private Color4 defaultPointColor;
         private double lightAzimuthDegrees = 45.0;
         private double lightElevationDegrees = 35.0;
+        private int renderingTier;
 
 #if DEBUG
         private Stopwatch renderTimer = new Stopwatch();
@@ -73,8 +72,6 @@ private void NotifyPropertyChanged(string propertyName)
 
         #endregion
 
-        #region public properties
-
         /// <summary>
         /// The LeftClickCommand is set according to the
         /// ViewModel's IsPanning or IsOrbiting properties.
@@ -97,6 +94,8 @@ public RoutedCommand LeftClickCommand
             }
         }
 
+        #region public properties
+
         public LineGeometry3D Grid
         {
             get { return worldGrid; }
@@ -124,15 +123,9 @@ public Viewport3DX View
             get { return watch_view; }
         }
 
-        /// <summary>
-        /// Used for testing to track the number of meshes that are merged
-        /// during render.
-        /// </summary>
-        public int MeshCount { get; set; }
-
-        public PhongMaterial WhiteMaterial { get; private set; }
+        public PhongMaterial WhiteMaterial { get; set; }
 
-        public PhongMaterial SelectedMaterial { get; private set; }
+        public PhongMaterial SelectedMaterial { get; set; }
 
         public Transform3D Model1Transform { get; private set; }
         
@@ -156,7 +149,7 @@ public PerspectiveCamera Camera
                 return this.camera;
             }
 
-            protected set
+            set
             {
                 camera = value;
                 NotifyPropertyChanged("Camera");
@@ -175,7 +168,8 @@ public double LightElevationDegrees
             set { lightElevationDegrees = value; }
         }
 
-        private Dictionary<string, Model3D> geometryDictionary;
+        private Dictionary<string, Model3D> geometryDictionary= new Dictionary<string, Model3D>();
+
         public Dictionary<string, Model3D> GeometryDictionary
         {
             get
@@ -221,13 +215,11 @@ public Watch3DView()
             watch_view.DataContext = this;
             Loaded += OnViewLoaded;
             Unloaded += OnViewUnloaded;
-            geometryDictionary = new Dictionary<string, Model3D>();
             InitializeHelix();
         }
 
         public Watch3DView(Guid id)
         {
-
             SetupScene();
 
             InitializeComponent();
@@ -236,9 +228,9 @@ public Watch3DView(Guid id)
             Unloaded += OnViewUnloaded;
 
             _id = id;
+
             geometryDictionary = new Dictionary<string, Model3D>();
             //InitializeHelix();
-
         }
 
         public Watch3DView(Guid id, IWatchViewModel dataContext)
@@ -253,6 +245,7 @@ public Watch3DView(Guid id, IWatchViewModel dataContext)
             Unloaded += OnViewUnloaded;
 
             _id = id;
+
             geometryDictionary = new Dictionary<string, Model3D>();
             //InitializeHelix();
         }
@@ -265,8 +258,8 @@ private void SetupScene()
             var lineColor = (Color)SharedDictionaryManager.DynamoColorsAndBrushesDictionary["EdgeColor"];
             defaultLineColor = new Color4(lineColor.R/255.0f, lineColor.G/255.0f, lineColor.B/255.0f, lineColor.A/255.0f);
 
-            lightColor = new Color4(0.9f, 0.9f, 0.9f, 1.0f);
-            lightDirection = new Vector3(-0.5f, -1.0f, 0.0f);
+            directionalLightColor = new Color4(0.9f, 0.9f, 0.9f, 1.0f);
+            directionalLightDirection = new Vector3(-0.5f, -1.0f, 0.0f);
 
             var matColor = (Color)SharedDictionaryManager.DynamoColorsAndBrushesDictionary["MaterialColor"];
             materialColor = new Color4(matColor.R/255.0f, matColor.G/255.0f, matColor.B/255.0f, matColor.A/255.0f);
@@ -320,8 +313,8 @@ private void InitializeHelix()
         {
             directionalLight = new DirectionalLight3D
             {
-                Color = lightColor,
-                Direction = lightDirection
+                Color = directionalLightColor,
+                Direction = directionalLightDirection
             };
 
             if (geometryDictionary != null && !geometryDictionary.ContainsKey("DirectionalLight"))
@@ -388,22 +381,11 @@ private static MeshGeometry3D DrawTestMesh()
 
         private void OnViewUnloaded(object sender, RoutedEventArgs e)
         {
-            var vm = DataContext as IWatchViewModel;
-            if (vm == null) return;
-            vm.VisualizationManager.RenderComplete -= VisualizationManagerRenderComplete;
-            vm.VisualizationManager.ResultsReadyToVisualize -= VisualizationManager_ResultsReadyToVisualize;
-            vm.ViewModel.PropertyChanged -= ViewModel_PropertyChanged;
-            vm.VisualizationManager.RenderSelection -= VisualizationManager_RenderSelection;
-            vm.VisualizationManager.UpdateGeometryOnNodeDeletion -= VisualizationManager_UpdateGeometryOnNodeDeletion;
-            vm.VisualizationManager.InitializeGeomtery -= VisualizationManager_InitializeGeomtery;
-
-            CompositionTarget.Rendering -= CompositionTarget_Rendering;
+            UnregisterEventHandlers();
         }
 
         private void OnViewLoaded(object sender, RoutedEventArgs e)
         {
-            CompositionTarget.Rendering += CompositionTarget_Rendering;
-
             MouseLeftButtonDown += view_MouseButtonIgnore;
             MouseLeftButtonUp += view_MouseButtonIgnore;
             MouseRightButtonUp += view_MouseRightButtonUp;
@@ -413,14 +395,9 @@ private void OnViewLoaded(object sender, RoutedEventArgs e)
             
             //check this for null so the designer can load the preview
             if (vm == null) return;
+            RegisterEventHandlers(vm);
 
-            vm.VisualizationManager.RenderComplete += VisualizationManagerRenderComplete;
-            vm.VisualizationManager.ResultsReadyToVisualize += VisualizationManager_ResultsReadyToVisualize;
-            vm.VisualizationManager.RenderSelection += VisualizationManager_RenderSelection;
-            vm.VisualizationManager.UpdateGeometryOnNodeDeletion += VisualizationManager_UpdateGeometryOnNodeDeletion;
-            vm.VisualizationManager.InitializeGeomtery += VisualizationManager_InitializeGeomtery;
-
-            var renderingTier = (RenderCapability.Tier >> 16);
+            renderingTier = (RenderCapability.Tier >> 16);
             var pixelShader3Supported = RenderCapability.IsPixelShaderVersionSupported(3, 0);
             var pixelShader4Supported = RenderCapability.IsPixelShaderVersionSupported(4, 0);
             var softwareEffectSupported = RenderCapability.IsShaderEffectSoftwareRenderingSupported;
@@ -430,9 +407,36 @@ private void OnViewLoaded(object sender, RoutedEventArgs e)
             vm.ViewModel.Model.Logger.Log(string.Format("RENDER : Pixel Shader 3 Supported: {0}", pixelShader3Supported), LogLevel.File);
             vm.ViewModel.Model.Logger.Log(string.Format("RENDER : Pixel Shader 4 Supported: {0}", pixelShader4Supported), LogLevel.File);
             vm.ViewModel.Model.Logger.Log(string.Format("RENDER : Software Effect Rendering Supported: {0}", softwareEffectSupported), LogLevel.File);
-            vm.ViewModel.Model.Logger.Log(string.Format("RENDER : Maximum hardware texture size: {0}", maxTextureSize), LogLevel.File);
+            vm.ViewModel.Model.Logger.Log(string.Format("RENDER : Maximum hardware texture size: {0}", maxTextureSize), LogLevel.File); 
+        }
 
+        private void UnregisterEventHandlers()
+        {
+            var vm = DataContext as IWatchViewModel;
+            if (vm == null) return;
+
+            vm.VisualizationManager.RenderComplete -= VisualizationManagerRenderComplete;
+            vm.VisualizationManager.ResultsReadyToVisualize -= VisualizationManager_ResultsReadyToVisualize;
+            vm.ViewModel.PropertyChanged -= ViewModel_PropertyChanged;
+
+            vm.VisualizationManager.RenderSelection -= VisualizationManager_RenderSelection;
+            vm.VisualizationManager.UpdateGeometryOnNodeDeletion -= VisualizationManager_UpdateGeometryOnNodeDeletion;
+            vm.VisualizationManager.InitializeGeomtery -= VisualizationManager_InitializeGeomtery;
+
+            CompositionTarget.Rendering -= CompositionTarget_Rendering;
+            vm.ViewModel.Model.ShutdownStarted -= Model_ShutdownStarted;
+        }
+
+        private void RegisterEventHandlers(IWatchViewModel vm)
+        {
+            vm.VisualizationManager.RenderComplete += VisualizationManagerRenderComplete;
+            vm.VisualizationManager.ResultsReadyToVisualize += VisualizationManager_ResultsReadyToVisualize;
             vm.ViewModel.PropertyChanged += ViewModel_PropertyChanged;
+            vm.VisualizationManager.RenderSelection += VisualizationManager_RenderSelection;
+            vm.VisualizationManager.UpdateGeometryOnNodeDeletion += VisualizationManager_UpdateGeometryOnNodeDeletion;
+            vm.VisualizationManager.InitializeGeomtery += VisualizationManager_InitializeGeomtery;
+            CompositionTarget.Rendering += CompositionTarget_Rendering;
+            vm.ViewModel.Model.ShutdownStarted += Model_ShutdownStarted;
         }
 
         /// <summary>
@@ -539,7 +543,12 @@ private KeyValuePair<string, Model3D>[] FindGeometryModel3DsForNode(NodeModel no
                     .Where(x => x.Value is GeometryModel3D)
                     .Select(x => x).ToArray();
 
-            return geometryModels;
+            return geometryModels;   
+        }
+
+        void Model_ShutdownStarted(Models.DynamoModel model)
+        {
+            UnregisterEventHandlers();
         }
 
         void ViewModel_PropertyChanged(object sender, PropertyChangedEventArgs e)
@@ -575,9 +584,9 @@ void CompositionTarget_Rendering(object sender, EventArgs e)
             var qel = Quaternion.RotationAxis(right, (float)((-LightElevationDegrees * Math.PI) / 180));
             var qaz = Quaternion.RotationAxis(cu, (float)((LightAzimuthDegrees * Math.PI) / 180));
             var v = Vector3.Transform(cf, qaz*qel);
-            lightDirection = v;
+            directionalLightDirection = v;
 
-            if ( !directionalLight.Direction.Equals(lightDirection))
+            if ( !directionalLight.Direction.Equals(directionalLightDirection))
             {
                 directionalLight.Direction = v;
             }
@@ -833,11 +842,16 @@ public void RenderDrawables(VisualizationEventArgs e)
                 return;
             }
 
+            // Don't render if the user's system is incapable.
+            if (renderingTier == 0)
+            {
+                return;
+            }
+
 #if DEBUG
             renderTimer.Start();
 #endif                  
             Text = null;
-            MeshCount = 0;
 
             var packages = e.Packages.Concat(e.SelectedPackages)
                 .Cast<HelixRenderPackage>().Where(rp=>rp.MeshVertexCount % 3 == 0);
@@ -852,6 +866,7 @@ public void RenderDrawables(VisualizationEventArgs e)
 
             AggregateRenderPackages(aggParams);
 
+
 #if DEBUG
             renderTimer.Stop();
             Debug.WriteLine(string.Format("RENDER: {0} ellapsed for compiling assets for rendering.", renderTimer.Elapsed));
@@ -898,8 +913,6 @@ public void RenderDrawables(VisualizationEventArgs e)
 
         private void AggregateRenderPackages(PackageAggregationParams parameters)
         {
-            MeshCount = 0;
-
             //Clear the geometry values before adding the package.
             VisualizationManager_InitializeGeomtery();
 
@@ -1046,8 +1059,8 @@ private void AggregateRenderPackages(PackageAggregationParams parameters)
                     if (rp.Colors != null)
                     {
                         var pf = PixelFormats.Bgra32;
-                        var stride = (4 * pf.BitsPerPixel + 7) / 8;
-                        var diffMap = BitmapSource.Create(rp.ColorsStride, rp.ColorsStride, 96.0, 96.0, pf, null, rp.Colors.ToArray(), stride);
+                        var stride = (rp.ColorsStride / 4 * pf.BitsPerPixel + 7) / 8;
+                        var diffMap = BitmapSource.Create(rp.ColorsStride/4, rp.ColorsStride/4, 96.0, 96.0, pf, null, rp.Colors.ToArray(), stride);
                         var diffMat = new PhongMaterial
                         {
                             Name = "White",
@@ -1063,7 +1076,6 @@ private void AggregateRenderPackages(PackageAggregationParams parameters)
                     ((MaterialGeometryModel3D) meshGeometry3D).SelectionColor = selectionColor; 
                     geometryDictionary.Add(id, meshGeometry3D);
                 }
-
                 var meshSet = meshGeometry3D.Geometry as MeshGeometry3D;
                 var idxCount = meshSet.Positions.Count;
 
@@ -1081,8 +1093,6 @@ private void AggregateRenderPackages(PackageAggregationParams parameters)
                     Text = parameters.Text;
                 }
 
-                MeshCount++;
-
                 meshGeometry3D.Geometry = meshSet;
             }
 
diff --git a/src/DynamoCoreWpf/VisualizationManager/VisualizationManager.cs b/src/DynamoCoreWpf/VisualizationManager/VisualizationManager.cs
index 371be1297ab..fc3e28cea30 100644
--- a/src/DynamoCoreWpf/VisualizationManager/VisualizationManager.cs
+++ b/src/DynamoCoreWpf/VisualizationManager/VisualizationManager.cs
@@ -191,6 +191,7 @@ public VisualizationManager(DynamoModel model)
             WorkspaceAdded(dynamoModel.CurrentWorkspace);
 
             renderPackageFactory = new HelixRenderPackageFactory();
+            RenderPackageFactory.TessellationParameters.ShowEdges = model.PreferenceSettings.ShowEdges;
 
             Start();
         }
@@ -570,9 +571,14 @@ protected virtual void HandleRenderPackagesReadyCore()
         public IRenderPackage CreateRenderPackageFromGraphicItem(IGraphicItem gItem)
         {
             var renderPackage = renderPackageFactory.CreateRenderPackage();
-            gItem.Tessellate(renderPackage, -1.0, renderPackageFactory.MaxTessellationDivisions);
+            gItem.Tessellate(renderPackage, renderPackageFactory.TessellationParameters);
             return renderPackage;
         }
+
+        public void UpdateAllNodeVisualsAndNotify()
+        {
+            RequestNodeVisualUpdateAsync(null, renderPackageFactory);
+        }
     }
 
     /// <summary>
diff --git a/src/DynamoSandbox/Program.cs b/src/DynamoSandbox/Program.cs
index 6ea122efb04..32d1c99f02c 100644
--- a/src/DynamoSandbox/Program.cs
+++ b/src/DynamoSandbox/Program.cs
@@ -19,7 +19,8 @@
 using DynamoUtilities;
 using System.Threading;
 using System.Globalization;
-
+using System.Runtime.InteropServices;
+using System.Text;
 using Microsoft.Win32;
 
 namespace DynamoSandbox
@@ -230,6 +231,9 @@ private static void PreloadShapeManager(ref string geometryFactoryPath, ref stri
             preloaderLocation = preloader.PreloaderLocation;
         }
 
+        [DllImport("msvcrt.dll")]
+        public static extern int _putenv(string env);
+
         [STAThread]
         public static void Main(string[] args)
         {
@@ -238,14 +242,36 @@ public static void Main(string[] args)
             try
             {
                 var cmdLineArgs = CommandLineArguments.FromArguments(args);
+                var supportedLocale = new HashSet<string>(new[]
+                        {
+                            "cs-CZ", "de-DE", "en-US", "es-ES", "fr-FR", "it-IT",
+                            "ja-JP", "ko-KR", "pl-PL", "pt-BR", "ru-RU", "zh-CN", "zh-TW"
+                        });
+                string libgLocale;
 
                 if (!string.IsNullOrEmpty(cmdLineArgs.Locale))
                 {
                     // Change the application locale, if a locale information is supplied.
                     Thread.CurrentThread.CurrentUICulture = new CultureInfo(cmdLineArgs.Locale);
                     Thread.CurrentThread.CurrentCulture = new CultureInfo(cmdLineArgs.Locale);
+                    libgLocale = cmdLineArgs.Locale;
+                }
+                else
+                {
+                    // In case no language is specified, libG's locale should be that of the OS.
+                    // There is no need to set Dynamo's locale in this case.
+                    libgLocale = CultureInfo.InstalledUICulture.ToString();
                 }
 
+                // If locale is not supported by Dynamo, default to en-US.
+                if (!supportedLocale.Any(s => s.Equals(libgLocale, StringComparison.InvariantCultureIgnoreCase)))
+                    libgLocale = "en-US";
+
+                // Change the locale that LibG depends on.
+                StringBuilder sb = new StringBuilder("LANGUAGE=");
+                sb.Append(libgLocale.Replace("-", "_"));
+                _putenv(sb.ToString());
+
                 MakeStandaloneAndRun(cmdLineArgs.CommandFilePath, out viewModel);
             }
             catch (Exception e)
diff --git a/src/Engine/ProtoCore/CompilerUtils.cs b/src/Engine/ProtoCore/CompilerUtils.cs
index 136b2cd63f0..66f3372e04d 100644
--- a/src/Engine/ProtoCore/CompilerUtils.cs
+++ b/src/Engine/ProtoCore/CompilerUtils.cs
@@ -304,7 +304,8 @@ private static bool CompileCodeBlockAST(Core core, ParseParam parseParams)
                 // partial classnames with their fully qualified names in ASTs
                 // before passing them for pre-compilation. If partial class is not found in map, 
                 // update Resolution map in elementResolver with fully resolved name from compiler.
-                var reWrittenNodes = ElementRewriter.RewriteElementNames(core.ClassTable, parseParams.ElementResolver, astNodes);
+                var reWrittenNodes = ElementRewriter.RewriteElementNames(core.ClassTable,  
+                    parseParams.ElementResolver, astNodes, core.BuildStatus.LogSymbolConflictWarning);
 
                 // Clone a disposable copy of AST nodes for PreCompile() as Codegen mutates AST's
                 // while performing SSA transforms and we want to keep the original AST's
diff --git a/src/Engine/ProtoCore/Namespace/ElementRewriter.cs b/src/Engine/ProtoCore/Namespace/ElementRewriter.cs
index 129a8aac16f..ac4039064d8 100644
--- a/src/Engine/ProtoCore/Namespace/ElementRewriter.cs
+++ b/src/Engine/ProtoCore/Namespace/ElementRewriter.cs
@@ -1,13 +1,11 @@
-using System.Diagnostics;
+using System;
+using System.Collections.Generic;
+using System.Linq;
 using ProtoCore.AST;
 using ProtoCore.AST.AssociativeAST;
 using ProtoCore.DSASM;
 using ProtoCore.SyntaxAnalysis;
 using ProtoCore.Utils;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 
 namespace ProtoCore.Namespace
 {
@@ -16,11 +14,21 @@ public class ElementRewriter : AstReplacer
     {
         private readonly ClassTable classTable;
         private readonly ElementResolver elementResolver;
+        private readonly SymbolConflictWarningHandler symbolConflictHandler;
+
+        public delegate void SymbolConflictWarningHandler(string symbolName, string[] collidingSymbolNames);
 
-        internal ElementRewriter(ClassTable classTable, ElementResolver resolver)
+        private void OnLogSymbolConflictWarning(string symbolName, string[] collidingSymbolNames)
+        {
+            if (symbolConflictHandler != null)
+                symbolConflictHandler(symbolName, collidingSymbolNames);
+        }
+
+        public ElementRewriter(ClassTable classTable, SymbolConflictWarningHandler warningHandler, ElementResolver resolver = null)
         {
             this.classTable = classTable;
-            this.elementResolver = resolver;
+            this.symbolConflictHandler = warningHandler;
+            this.elementResolver = resolver ?? new ElementResolver();
         }
 
         /// <summary>
@@ -30,12 +38,13 @@ internal ElementRewriter(ClassTable classTable, ElementResolver resolver)
         /// update ResolutionMap with fully resolved name from compiler.
         /// </summary>
         /// <param name="classTable"></param>
+        /// <param name="handler"></param>
         /// <param name="elementResolver"></param>
         /// <param name="astNodes"> parent AST node </param>
-        public static IEnumerable<Node> RewriteElementNames(ClassTable classTable,
-            ElementResolver elementResolver, IEnumerable<Node> astNodes)
+        public static IEnumerable<Node> RewriteElementNames(ClassTable classTable, 
+            ElementResolver elementResolver, IEnumerable<Node> astNodes, SymbolConflictWarningHandler handler = null)
         {
-            var elementRewriter = new ElementRewriter(classTable, elementResolver);
+            var elementRewriter = new ElementRewriter(classTable, handler, elementResolver);
             return astNodes.OfType<AssociativeNode>().Select(astNode => astNode.Accept(elementRewriter)).Cast<Node>().ToList();
         }
 
@@ -128,31 +137,36 @@ private string ResolveClassName(AssociativeNode identifierList)
                 return String.Empty;
 
             var resolvedName = elementResolver.LookupResolvedName(partialName);
-            if (string.IsNullOrEmpty(resolvedName))
-            {
-                // If namespace resolution map does not contain entry for partial name, 
-                // back up on compiler to resolve the namespace from partial name
-                var matchingClasses = CoreUtils.GetResolvedClassName(classTable, identifierList);
+            if (!string.IsNullOrEmpty(resolvedName)) 
+                return resolvedName;
+            
+            // If namespace resolution map does not contain entry for partial name, 
+            // back up on compiler to resolve the namespace from partial name
+            var matchingClasses = CoreUtils.GetResolvedClassName(classTable, identifierList);
 
-                if (matchingClasses.Length == 1)
-                {
-                    resolvedName = matchingClasses[0];
-                    var assemblyName = CoreUtils.GetAssemblyFromClassName(classTable, resolvedName);
+            if (matchingClasses.Length == 1)
+            {
+                resolvedName = matchingClasses[0];
+                var assemblyName = CoreUtils.GetAssemblyFromClassName(classTable, resolvedName);
 
-                    elementResolver.AddToResolutionMap(partialName, resolvedName, assemblyName);
-                }
+                elementResolver.AddToResolutionMap(partialName, resolvedName, assemblyName);
+            }
+            else if (matchingClasses.Length > 1)
+            {
+                OnLogSymbolConflictWarning(partialName, matchingClasses);
             }
             return resolvedName;
         }
 
         private AssociativeNode RewriteIdentifierListNode(AssociativeNode identifierList)
         {
-            var identListNode = identifierList as IdentifierListNode;
             var resolvedName = ResolveClassName(identifierList);
 
             if (string.IsNullOrEmpty(resolvedName))
                 return identifierList;
 
+            var identListNode = identifierList as IdentifierListNode;
+
             var newIdentList = CoreUtils.CreateNodeFromString(resolvedName);
 
             // If the original input node matches with the resolved name, simply return 
diff --git a/src/Engine/ProtoCore/Reflection/GraphicDataProvider.cs b/src/Engine/ProtoCore/Reflection/GraphicDataProvider.cs
index c4690bc2f4c..701114e3065 100644
--- a/src/Engine/ProtoCore/Reflection/GraphicDataProvider.cs
+++ b/src/Engine/ProtoCore/Reflection/GraphicDataProvider.cs
@@ -117,7 +117,7 @@ private static IGraphicDataProvider GetDataProviderFromAssembly(System.Type type
             return provider;
         }
 
-        public void Tessellate(List<object> objects, IRenderPackage package, double tol)
+        public void Tessellate(List<object> objects, IRenderPackage package, TessellationParameters parameters)
         {
             foreach (var item in objects)
             {
@@ -127,7 +127,7 @@ public void Tessellate(List<object> objects, IRenderPackage package, double tol)
 
                 foreach (var g in graphicItems)
                 {
-                    g.Tessellate(package, tol);
+                    g.Tessellate(package, parameters);
                 }
             }
         }
@@ -221,7 +221,7 @@ public List<IGraphicItem> GetGraphicItems(object obj)
             return null;
         }
 
-        public void Tessellate(List<object> objects, IRenderPackage package, double tol)
+        public void Tessellate(List<object> objects, IRenderPackage package, TessellationParameters parameters)
         {
             throw new NotImplementedException();
         }
diff --git a/src/Libraries/Analysis/Label.cs b/src/Libraries/Analysis/Label.cs
index 92abdf7404f..c01707a6637 100644
--- a/src/Libraries/Analysis/Label.cs
+++ b/src/Libraries/Analysis/Label.cs
@@ -32,7 +32,7 @@ public static Label ByPointAndString(Point point, string label)
         }
 
         [IsVisibleInDynamoLibrary(false)]
-        public void Tessellate(IRenderPackage package, double tol = -1, int maxGridLines = 512)
+        public void Tessellate(IRenderPackage package, TessellationParameters parameters)
         {
             package.AddPointVertex(point.X, point.Y, point.Z);
             package.Description = label;
diff --git a/src/Libraries/Analysis/PointData.cs b/src/Libraries/Analysis/PointData.cs
index fe15d7b847d..cd0c49346a4 100644
--- a/src/Libraries/Analysis/PointData.cs
+++ b/src/Libraries/Analysis/PointData.cs
@@ -2,12 +2,14 @@
 using System.Collections.Generic;
 using System.Linq;
 using Autodesk.DesignScript.Geometry;
+using Autodesk.DesignScript.Runtime;
 
 namespace Analysis
 {
     /// <summary>
     /// A class for storing structure point analysis data.
     /// </summary>
+    [IsVisibleInDynamoLibrary(false)]
     public class PointData : IStructuredData<Point, double> //, IGraphicItem
     {
         /// <summary>
diff --git a/src/Libraries/Analysis/SurfaceData.cs b/src/Libraries/Analysis/SurfaceData.cs
index b2ce5be10fa..3a96a687f57 100644
--- a/src/Libraries/Analysis/SurfaceData.cs
+++ b/src/Libraries/Analysis/SurfaceData.cs
@@ -3,12 +3,14 @@
 using System.Diagnostics;
 using System.Linq;
 using Autodesk.DesignScript.Geometry;
+using Autodesk.DesignScript.Runtime;
 
 namespace Analysis
 {
     /// <summary>
     /// A class for storing structured surface analysis data.
     /// </summary>
+    [IsVisibleInDynamoLibrary(false)]
     public class SurfaceData : ISurfaceData<UV, double>
     {
         /// <summary>
diff --git a/src/Libraries/Analysis/VectorData.cs b/src/Libraries/Analysis/VectorData.cs
index 1a86123adef..ec71d9f322c 100644
--- a/src/Libraries/Analysis/VectorData.cs
+++ b/src/Libraries/Analysis/VectorData.cs
@@ -2,12 +2,14 @@
 using System.Collections.Generic;
 using System.Linq;
 using Autodesk.DesignScript.Geometry;
+using Autodesk.DesignScript.Runtime;
 
 namespace Analysis
 {
     /// <summary>
     /// A class for storing structured vector analysis data.
     /// </summary>
+    [IsVisibleInDynamoLibrary(false)]
     public class VectorData : IStructuredData<Point, Vector>
     {
         private const byte VectorColor = 120;
diff --git a/src/Libraries/CoreNodeModels/Properties/Resources.Designer.cs b/src/Libraries/CoreNodeModels/Properties/Resources.Designer.cs
index 17d16c681fa..9820537cdca 100644
--- a/src/Libraries/CoreNodeModels/Properties/Resources.Designer.cs
+++ b/src/Libraries/CoreNodeModels/Properties/Resources.Designer.cs
@@ -996,6 +996,24 @@ internal static string SelectFromComboBoxToolTip {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Nothing selected..
+        /// </summary>
+        internal static string SelectionNodeNothingSelected {
+            get {
+                return ResourceManager.GetString("SelectionNodeNothingSelected", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Select something in the model..
+        /// </summary>
+        internal static string SelectionNodeSugestion {
+            get {
+                return ResourceManager.GetString("SelectionNodeSugestion", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to The selected elements..
         /// </summary>
diff --git a/src/Libraries/CoreNodeModels/Properties/Resources.en-US.resx b/src/Libraries/CoreNodeModels/Properties/Resources.en-US.resx
index a582d87dd0d..21dcc2ebfe2 100644
--- a/src/Libraries/CoreNodeModels/Properties/Resources.en-US.resx
+++ b/src/Libraries/CoreNodeModels/Properties/Resources.en-US.resx
@@ -527,4 +527,10 @@
   <data name="ListCreateInPortToolTip" xml:space="preserve">
     <value>Item Index #{0}</value>
   </data>
+  <data name="SelectionNodeNothingSelected" xml:space="preserve">
+    <value>Nothing selected.</value>
+  </data>
+  <data name="SelectionNodeSugestion" xml:space="preserve">
+    <value>Select something in the model.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Libraries/CoreNodeModels/Properties/Resources.resx b/src/Libraries/CoreNodeModels/Properties/Resources.resx
index a582d87dd0d..21dcc2ebfe2 100644
--- a/src/Libraries/CoreNodeModels/Properties/Resources.resx
+++ b/src/Libraries/CoreNodeModels/Properties/Resources.resx
@@ -527,4 +527,10 @@
   <data name="ListCreateInPortToolTip" xml:space="preserve">
     <value>Item Index #{0}</value>
   </data>
+  <data name="SelectionNodeNothingSelected" xml:space="preserve">
+    <value>Nothing selected.</value>
+  </data>
+  <data name="SelectionNodeSugestion" xml:space="preserve">
+    <value>Select something in the model.</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Libraries/CoreNodeModels/Selection.cs b/src/Libraries/CoreNodeModels/Selection.cs
index a07621aa077..a54d9bb5ac9 100644
--- a/src/Libraries/CoreNodeModels/Selection.cs
+++ b/src/Libraries/CoreNodeModels/Selection.cs
@@ -25,8 +25,6 @@ public abstract class SelectionBase<TSelection, TResult> : NodeModel
         private List<TSelection> selection = new List<TSelection>();
         private readonly SelectionType selectionType;
         private readonly SelectionObjectType selectionObjectType;
-
-        private const string SELECTION_SUGGESTION = "Select something in the model.";
         
         #region public properties
 
@@ -87,7 +85,7 @@ public string Text
         /// </summary>
         public virtual string SelectionSuggestion
         {
-            get { return SELECTION_SUGGESTION; }
+            get { return Resources.SelectionNodeSugestion; }
         }
 
         #endregion
@@ -123,7 +121,7 @@ public override string ToString()
         {
             return SelectionResults.Any()
                 ? string.Format("{0} : {1}", Prefix, FormatSelectionText(SelectionResults))
-                : "Nothing selected.";
+                : Resources.SelectionNodeNothingSelected;
         }
 
         public void ClearSelections()
diff --git a/src/Libraries/CoreNodeModelsWpf/NodeViewCustomizations/FileSystemBrowser.cs b/src/Libraries/CoreNodeModelsWpf/NodeViewCustomizations/FileSystemBrowser.cs
index 48cf6d13d2b..3edc8c512c1 100644
--- a/src/Libraries/CoreNodeModelsWpf/NodeViewCustomizations/FileSystemBrowser.cs
+++ b/src/Libraries/CoreNodeModelsWpf/NodeViewCustomizations/FileSystemBrowser.cs
@@ -24,13 +24,13 @@ public void CustomizeView(FileSystemBrowser model, NodeView nodeView)
             };
 
             readFileButton.Click += readFileButton_Click;
-            readFileButton.Content = "Browse...";
+            readFileButton.Content = Dynamo.Wpf.Properties.Resources.BrowserNodeButtonLabel;
             readFileButton.HorizontalAlignment = HorizontalAlignment.Stretch;
             readFileButton.VerticalAlignment = VerticalAlignment.Center;
 
             var tb = new TextBox();
             if (string.IsNullOrEmpty(model.Value))
-                model.Value = "No file selected.";
+                model.Value = Dynamo.Wpf.Properties.Resources.BrowserNodeNoFileSelected;
 
             tb.HorizontalAlignment = HorizontalAlignment.Stretch;
             tb.VerticalAlignment = VerticalAlignment.Center;
diff --git a/src/Libraries/CoreNodeModelsWpf/NodeViewCustomizations/StringInput.cs b/src/Libraries/CoreNodeModelsWpf/NodeViewCustomizations/StringInput.cs
index 7736ce2b7e6..9a39cb9d896 100644
--- a/src/Libraries/CoreNodeModelsWpf/NodeViewCustomizations/StringInput.cs
+++ b/src/Libraries/CoreNodeModelsWpf/NodeViewCustomizations/StringInput.cs
@@ -22,7 +22,11 @@ public void CustomizeView(StringInput stringInput, NodeView nodeView)
             this.nodeModel = stringInput;
             this.dynamoViewModel = nodeView.ViewModel.DynamoViewModel;
 
-            this.editWindowItem = new MenuItem { Header = "Edit...", IsCheckable = false };
+            this.editWindowItem = new MenuItem
+            {
+                Header = Properties.Resources.StringInputNodeEditMenu, 
+                IsCheckable = false
+            };
             nodeView.MainContextMenu.Items.Add(editWindowItem);
 
             editWindowItem.Click += editWindowItem_Click;
diff --git a/src/Libraries/CoreNodeModelsWpf/NodeViewCustomizations/Watch.cs b/src/Libraries/CoreNodeModelsWpf/NodeViewCustomizations/Watch.cs
index 3588bd2bb73..2710363581f 100644
--- a/src/Libraries/CoreNodeModelsWpf/NodeViewCustomizations/Watch.cs
+++ b/src/Libraries/CoreNodeModelsWpf/NodeViewCustomizations/Watch.cs
@@ -76,7 +76,7 @@ private void Bind(WatchTree watchTree, NodeView nodeView)
 
             var rawDataMenuItem = new MenuItem
             {
-                Header = "Show Raw Data",
+                Header = Properties.Resources.WatchNodeRawDataMenu,
                 IsCheckable = true,
             };
             rawDataMenuItem.SetBinding(MenuItem.IsCheckedProperty, checkedBinding);
diff --git a/src/Libraries/CoreNodes/GeometryColor.cs b/src/Libraries/CoreNodes/GeometryColor.cs
new file mode 100644
index 00000000000..c68f1dbf467
--- /dev/null
+++ b/src/Libraries/CoreNodes/GeometryColor.cs
@@ -0,0 +1,109 @@
+using System;
+using System.Linq;
+using Autodesk.DesignScript.Geometry;
+using Autodesk.DesignScript.Interfaces;
+using Autodesk.DesignScript.Runtime;
+
+namespace DSCore
+{
+    public class Display :  IGraphicItem
+    {
+        internal Geometry geometry;
+        internal Color color;
+
+        private Display(Geometry geometry, Color color)
+        {
+            this.geometry = geometry;
+            this.color = color;
+        }
+
+        /// <summary>
+        /// Display geometry using a color.
+        /// </summary>
+        /// <param name="geometry">The geometry to which you would like to apply color.</param>
+        /// <param name="color">The color.</param>
+        /// <returns>A Display object.</returns>
+        public static Display ByGeometryColor(Geometry geometry, Color color)
+        {
+            if (geometry == null)
+            {
+                throw new ArgumentNullException("geometry");
+            }
+
+            if (color == null)
+            {
+                throw new ArgumentNullException("color");
+            }
+
+            return new Display(geometry, color);
+        }
+
+        [IsVisibleInDynamoLibrary(false)]
+        public void Tessellate(IRenderPackage package, TessellationParameters parameters)
+        {
+            package.RequiresPerVertexColoration = true;
+
+            // As you add more data to the render package, you need
+            // to keep track of the index where this coloration will 
+            // start from.
+
+            geometry.Tessellate(package, parameters);
+
+            if (parameters.ShowEdges)
+            {
+                var surf = geometry as Surface;
+                if (surf != null)
+                {
+                    foreach (var curve in surf.PerimeterCurves())
+                    {
+                        curve.Tessellate(package, parameters);
+                        curve.Dispose();
+                    }
+                }
+
+                var solid = geometry as Solid;
+                if (solid != null)
+                {
+                    foreach (var geom in solid.Edges.Select(edge => edge.CurveGeometry))
+                    {
+                        geom.Tessellate(package, parameters);
+                        geom.Dispose();
+                    }
+                }
+            }
+
+            if (package.LineVertexCount > 0)
+            {
+                package.ApplyLineVertexColors(CreateColorByteArrayOfSize(package.LineVertexCount, color.Red, color.Green, color.Blue, color.Alpha));
+            }
+
+            if (package.PointVertexCount > 0)
+            {
+                package.ApplyPointVertexColors(CreateColorByteArrayOfSize(package.PointVertexCount, color.Red, color.Green, color.Blue, color.Alpha));
+            }
+
+            if (package.MeshVertexCount > 0)
+            {
+                package.ApplyMeshVertexColors(CreateColorByteArrayOfSize(package.MeshVertexCount, color.Red, color.Green, color.Blue, color.Alpha));
+            }
+        }
+
+        private static byte[] CreateColorByteArrayOfSize(int size, byte red, byte green, byte blue, byte alpha)
+        {
+            var arr = new byte[size * 4];
+            for (var i = 0; i < arr.Count(); i+=4)
+            {
+                arr[i] = red;
+                arr[i + 1] = green;
+                arr[i + 2] = blue;
+                arr[i + 3] = alpha;
+            }
+            return arr;
+        }
+
+        public override string ToString()
+        {
+            return string.Format("Display" + "(Geometry = {0}, Appearance = {1})", geometry, color);
+        }
+    }
+}
diff --git a/src/Libraries/DSOffice/DSOffice.csproj b/src/Libraries/DSOffice/DSOffice.csproj
index 50118f45a77..d8880c35d90 100644
--- a/src/Libraries/DSOffice/DSOffice.csproj
+++ b/src/Libraries/DSOffice/DSOffice.csproj
@@ -91,11 +91,11 @@
   <ItemGroup>
     <EmbeddedResource Include="DSOfficeImages.resx" />
     <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>PublicResXFileCodeGenerator</Generator>
+      <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.en-US.resx">
-      <Generator>PublicResXFileCodeGenerator</Generator>
+      <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.en-US.Designer.cs</LastGenOutput>
     </EmbeddedResource>
     <ProjectReference Include="..\..\Engine\ProtoCore\ProtoCore.csproj">
diff --git a/src/Libraries/DSOffice/Properties/Resources.Designer.cs b/src/Libraries/DSOffice/Properties/Resources.Designer.cs
index 2cce079d7cd..e9042d788d2 100644
--- a/src/Libraries/DSOffice/Properties/Resources.Designer.cs
+++ b/src/Libraries/DSOffice/Properties/Resources.Designer.cs
@@ -22,7 +22,7 @@ namespace DSOffice.Properties {
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    public class Resources {
+    internal class Resources {
         
         private static global::System.Resources.ResourceManager resourceMan;
         
@@ -36,7 +36,7 @@ internal Resources() {
         ///   Returns the cached ResourceManager instance used by this class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        public static global::System.Resources.ResourceManager ResourceManager {
+        internal static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
                     global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DSOffice.Properties.Resources", typeof(Resources).Assembly);
@@ -51,7 +51,7 @@ internal Resources() {
         ///   resource lookups using this strongly typed resource class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        public static global::System.Globalization.CultureInfo Culture {
+        internal static global::System.Globalization.CultureInfo Culture {
             get {
                 return resourceCulture;
             }
@@ -63,7 +63,7 @@ internal Resources() {
         /// <summary>
         ///   Looks up a localized string similar to Error setting up communication with Excel.  Try closing any open Excel instances..
         /// </summary>
-        public static string ExcelCommunicationError {
+        internal static string ExcelCommunicationError {
             get {
                 return ResourceManager.GetString("ExcelCommunicationError", resourceCulture);
             }
@@ -72,7 +72,7 @@ public static string ExcelCommunicationError {
         /// <summary>
         ///   Looks up a localized string similar to Excel is not installed..
         /// </summary>
-        public static string ExcelNotInstalled {
+        internal static string ExcelNotInstalled {
             get {
                 return ResourceManager.GetString("ExcelNotInstalled", resourceCulture);
             }
@@ -81,7 +81,7 @@ public static string ExcelNotInstalled {
         /// <summary>
         ///   Looks up a localized string similar to One or more of the input types are not matching. Couldn&apos;t find a version of {0} that takes arguments of type {1}.
         /// </summary>
-        public static string kMethodResolutionFailureWithTypes {
+        internal static string kMethodResolutionFailureWithTypes {
             get {
                 return ResourceManager.GetString("kMethodResolutionFailureWithTypes", resourceCulture);
             }
diff --git a/src/Libraries/Display/Display.cs b/src/Libraries/Display/Display.cs
index ba4a567f3c2..479f52fc85c 100644
--- a/src/Libraries/Display/Display.cs
+++ b/src/Libraries/Display/Display.cs
@@ -5,16 +5,24 @@
 using Autodesk.DesignScript.Geometry;
 using Autodesk.DesignScript.Interfaces;
 using Autodesk.DesignScript.Runtime;
+using DSCore;
+using Math = DSCore.Math;
 
-namespace DSCore
+namespace Display
 {
     public class Display :  IGraphicItem
     {
+        #region private members
+
         private readonly Geometry geometry;
         private readonly Color singleColor;
-        private Color[][] colorMap;
-        private bool renderEdges = false;
-        private const int Samples = 64;
+        private readonly Color[][] colorMap;
+        private const int LowestPower = 3;
+        private const int HighestPower = 10;
+
+        #endregion
+
+        #region private constructors
 
         private Display(Geometry geometry, Color color)
         {
@@ -22,22 +30,15 @@ private Display(Geometry geometry, Color color)
             this.singleColor = color;
         }
 
-        private Display(Surface surface, UV[] uvs, Color[] colors)
+        private Display(Surface surface, UV[] uvs, Color[] colors, int samples)
         {
-            this.geometry = surface;
-            this.colorMap = ComputeColorMap(surface, uvs, colors);
+            geometry = surface;
+            colorMap = ComputeColorMap(surface, uvs, colors, samples, samples);
         }
 
-        /// <summary>
-        /// Compute a set of color maps from a set of SurfaceData objects.
-        /// </summary>
-        /// <param name="surfaceDatas"></param>
-        /// <param name="colorRange"></param>
-        /// <returns></returns>
-        private Color[][] ComputeColorMap(Surface surface, UV[] uvs,  Color[] colors)
-        {
-            return Utils.CreateGradientColorMap(colors, uvs, Samples, Samples);
-        }
+        #endregion
+
+        #region static constructors
 
         /// <summary>
         /// Display geometry using a color.
@@ -61,12 +62,16 @@ public static Display ByGeometryColor(Geometry geometry, Color color)
         }
 
         /// <summary>
-        /// Display interpolated color values on a surface from data stored in a SurfaceData object.
+        /// Display interpolated color values on a surface given a list of colors and a list of UVs .
         /// </summary>
-        /// <param name="surfaceData">The SurfaceData object.</param>
-        /// <param name="colorRange">A ColorRange1D object.</param>
+        /// <param name="surface">The surface on which to apply the colors.</param>
+        /// <param name="uvs">A set of UV locations on the surface corresponding to the colors.</param>
+        /// <param name="colors">A set of Colors corresponding to the uvs.</param>
+        /// <param name="precision">A value between 0.0 (low) and 1.0 (high) which defines the resolution.
+        /// The default value is 0.75. This value controls the number of samples at which interpolated color 
+        /// values are calculated.</param>
         /// <returns>A Display object.</returns>
-        public static Display BySurfaceUvsColors(Surface surface, UV[] uvs, Color[] colors)
+        public static Display BySurfaceUvsColors(Surface surface, UV[] uvs, Color[] colors, double precision = 0.75)
         {
             if (!uvs.Any())
             {
@@ -88,25 +93,61 @@ public static Display BySurfaceUvsColors(Surface surface, UV[] uvs, Color[] colo
                 throw new ArgumentNullException("colors");
             }
 
-            return new Display(surface, uvs, colors);
+            if (precision < 0.0 || precision > 1.0)
+            {
+                throw new Exception("The precision must be in the range 0.0 to 1.0");
+            }
+
+            var samples = ComputeSamplesFromNormalizedValue(precision, LowestPower, HighestPower);
+
+            return new Display(surface, uvs, colors, samples);
         }
 
+        #endregion
+
+        #region public methods
+
         [IsVisibleInDynamoLibrary(false)]
-        public void Tessellate(IRenderPackage package, double tol = -1, int maxGridLines = 512)
+        public void Tessellate(IRenderPackage package, TessellationParameters parameters)
         {
             if (singleColor != null)
             {
-                CreateGeometryRenderData(singleColor, package, tol, maxGridLines);
+                CreateGeometryRenderData(singleColor, package, parameters);
             }
             else if (colorMap != null)
             {
-                CreateColorMappedSurfaceRenderData(colorMap, package, tol, maxGridLines);
+                if (!colorMap.Any())
+                {
+                    return;
+                }
+
+                CreateColorMapOnSurface(colorMap, package, parameters);
             }
         }
 
-        private void CreateColorMappedSurfaceRenderData(Color[][] colorMap , IRenderPackage package, double tol, int maxGridLines)
+        public override string ToString()
         {
-            geometry.Tessellate(package, tol, maxGridLines);
+            return string.Format("Display" + "(Geometry = {0}, Appearance = {1})", geometry, singleColor != null ? singleColor.ToString() : "Multiple colors.");
+        }
+
+        #endregion
+
+        #region private helper methods
+
+        /// <summary>
+        /// Compute a set of color maps from a set of SurfaceData objects.
+        /// </summary>
+        /// <returns></returns>
+        private static Color[][] ComputeColorMap(Surface surface, IEnumerable<UV> uvs, Color[] colors, int samplesU, int samplesV)
+        {
+            return Utils.CreateGradientColorMap(colors, uvs, samplesU, samplesV);
+        }
+
+        private void CreateColorMapOnSurface(Color[][] colorMap , IRenderPackage package, TessellationParameters parameters)
+        {
+            const byte gray = 80;
+ 
+            geometry.Tessellate(package, parameters);
 
             var colorBytes = new List<byte>();
 
@@ -122,10 +163,18 @@ private void CreateColorMappedSurfaceRenderData(Color[][] colorMap , IRenderPack
             }
 
             package.SetColors(colorBytes.ToArray());
-            package.ColorsStride = colorMap.First().Length;
+            package.ColorsStride = colorMap.First().Length * 4;
+
+            TessellateEdges(package, parameters);
+
+            if (package.LineVertexCount > 0)
+            {
+                package.ApplyLineVertexColors(CreateColorByteArrayOfSize(package.LineVertexCount, gray, gray,
+                    gray, 255));
+            }
         }
 
-        private void CreateGeometryRenderData(Color color, IRenderPackage package, double tol, int maxGridLines)
+        private void CreateGeometryRenderData(Color color, IRenderPackage package, TessellationParameters parameters)
         {
             package.RequiresPerVertexColoration = true;
 
@@ -133,30 +182,9 @@ private void CreateGeometryRenderData(Color color, IRenderPackage package, doubl
             // to keep track of the index where this coloration will 
             // start from.
 
-            geometry.Tessellate(package, tol, maxGridLines);
+            geometry.Tessellate(package, parameters);
 
-            if (renderEdges)
-            {
-                var surf = geometry as Surface;
-                if (surf != null)
-                {
-                    foreach (var curve in surf.PerimeterCurves())
-                    {
-                        curve.Tessellate(package, tol, maxGridLines);
-                        curve.Dispose();
-                    }
-                }
-
-                var solid = geometry as Solid;
-                if (solid != null)
-                {
-                    foreach (var geom in solid.Edges.Select(edge => edge.CurveGeometry))
-                    {
-                        geom.Tessellate(package, tol, maxGridLines);
-                        geom.Dispose();
-                    }
-                }
-            }
+            TessellateEdges(package, parameters);
 
             if (package.LineVertexCount > 0)
             {
@@ -177,6 +205,31 @@ private void CreateGeometryRenderData(Color color, IRenderPackage package, doubl
             }
         }
 
+        private void TessellateEdges(IRenderPackage package, TessellationParameters parameters)
+        {
+            if (!parameters.ShowEdges) return;
+
+            var surf = geometry as Surface;
+            if (surf != null)
+            {
+                foreach (var curve in surf.PerimeterCurves())
+                {
+                    curve.Tessellate(package, parameters);
+                    curve.Dispose();
+                }
+            }
+
+            var solid = geometry as Solid;
+            if (solid != null)
+            {
+                foreach (var geom in solid.Edges.Select(edge => edge.CurveGeometry))
+                {
+                    geom.Tessellate(package, parameters);
+                    geom.Dispose();
+                }
+            }
+        }
+
         private static byte[] CreateColorByteArrayOfSize(int size, byte red, byte green, byte blue, byte alpha)
         {
             var arr = new byte[size * 4];
@@ -190,9 +243,16 @@ private static byte[] CreateColorByteArrayOfSize(int size, byte red, byte green,
             return arr;
         }
 
-        public override string ToString()
+        private static int ComputeSamplesFromNormalizedValue(double value, int lowestPower, int highestPower)
         {
-            return string.Format("Display" + "(Geometry = {0}, Appearance = {1})", geometry, singleColor != null ? singleColor.ToString() : "Multiple colors.");
+            // Calculate the size of the image
+            // Samples range from 2^2 (4) - 2^9 (512)
+            var expRange = highestPower - lowestPower;
+            var t = expRange*value;
+            var finalExp = (int)Math.Pow(2, (int) (LowestPower + t));
+            return finalExp;
         }
+
+        #endregion
     }
 }
diff --git a/src/Libraries/Display/Display.csproj b/src/Libraries/Display/Display.csproj
index 09896c1ddca..1f16004b04d 100644
--- a/src/Libraries/Display/Display.csproj
+++ b/src/Libraries/Display/Display.csproj
@@ -23,6 +23,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <DocumentationFile>..\..\..\bin\AnyCPU\Debug\Display.XML</DocumentationFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
diff --git a/src/Libraries/DynamoWatch3D/Properties/Resources.Designer.cs b/src/Libraries/DynamoWatch3D/Properties/Resources.Designer.cs
index 8f8fef851cd..66eae1978e6 100644
--- a/src/Libraries/DynamoWatch3D/Properties/Resources.Designer.cs
+++ b/src/Libraries/DynamoWatch3D/Properties/Resources.Designer.cs
@@ -95,5 +95,14 @@ internal static string Watch3DSearchTags {
                 return ResourceManager.GetString("Watch3DSearchTags", resourceCulture);
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Zoom to Fit.
+        /// </summary>
+        internal static string ZoomToFit {
+            get {
+                return ResourceManager.GetString("ZoomToFit", resourceCulture);
+            }
+        }
     }
 }
diff --git a/src/Libraries/DynamoWatch3D/Properties/Resources.en-US.resx b/src/Libraries/DynamoWatch3D/Properties/Resources.en-US.resx
index 41bed37f677..6bd16d8e1ec 100644
--- a/src/Libraries/DynamoWatch3D/Properties/Resources.en-US.resx
+++ b/src/Libraries/DynamoWatch3D/Properties/Resources.en-US.resx
@@ -131,4 +131,7 @@
     <value>panel;3dview;view;inspect;debug;watch geo;</value>
     <comment>Search Tags for Watch 3D</comment>
   </data>
+  <data name="ZoomToFit" xml:space="preserve">
+    <value>Zoom to Fit</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Libraries/DynamoWatch3D/Properties/Resources.resx b/src/Libraries/DynamoWatch3D/Properties/Resources.resx
index 41bed37f677..6bd16d8e1ec 100644
--- a/src/Libraries/DynamoWatch3D/Properties/Resources.resx
+++ b/src/Libraries/DynamoWatch3D/Properties/Resources.resx
@@ -131,4 +131,7 @@
     <value>panel;3dview;view;inspect;debug;watch geo;</value>
     <comment>Search Tags for Watch 3D</comment>
   </data>
+  <data name="ZoomToFit" xml:space="preserve">
+    <value>Zoom to Fit</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/Libraries/DynamoWatch3D/Watch3D.cs b/src/Libraries/DynamoWatch3D/Watch3D.cs
index 2d7cdd8cb86..d9769963c92 100644
--- a/src/Libraries/DynamoWatch3D/Watch3D.cs
+++ b/src/Libraries/DynamoWatch3D/Watch3D.cs
@@ -68,7 +68,7 @@ public void CustomizeView(Watch3D model, NodeView nodeView)
 
             model.RequestUpdateLatestCameraPosition += this.UpdateLatestCameraPosition;
 
-            var mi = new MenuItem { Header = "Zoom to Fit" };
+            var mi = new MenuItem { Header = DynamoWatch3D.Properties.Resources.ZoomToFit };
             mi.Click += mi_Click;
 
             nodeView.MainContextMenu.Items.Add(mi);
diff --git a/src/Libraries/GeometryUI/ExportWithUnits.cs b/src/Libraries/GeometryUI/ExportWithUnits.cs
index 91bc39d27e5..cdf14f08019 100644
--- a/src/Libraries/GeometryUI/ExportWithUnits.cs
+++ b/src/Libraries/GeometryUI/ExportWithUnits.cs
@@ -18,6 +18,7 @@ namespace GeometryUI
 {
     [NodeCategory(BuiltinNodeCategories.GEOMETRY)]
     [NodeName("ExportToSAT")]
+    [NodeDescription("ExportToSATDescripiton", typeof(GeometryUI.Properties.Resources))]
     [NodeSearchTags("ExportWithUnitsSearchTags", typeof(GeometryUI.Properties.Resources))]
     [IsDesignScriptCompatible]
     public class ExportWithUnits : NodeModel
diff --git a/src/Libraries/GeometryUI/Properties/Resources.Designer.cs b/src/Libraries/GeometryUI/Properties/Resources.Designer.cs
index 2428f8a1ddd..edae2bf7bcc 100644
--- a/src/Libraries/GeometryUI/Properties/Resources.Designer.cs
+++ b/src/Libraries/GeometryUI/Properties/Resources.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.34014
+//     Runtime Version:4.0.30319.18408
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -60,6 +60,15 @@ internal Resources() {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Exports the specified geometry to the given SAT  file path..
+        /// </summary>
+        internal static string ExportToSATDescripiton {
+            get {
+                return ResourceManager.GetString("ExportToSATDescripiton", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to File to export the geometry to..
         /// </summary>
diff --git a/src/Libraries/GeometryUI/Properties/Resources.en-US.Designer.cs b/src/Libraries/GeometryUI/Properties/Resources.en-US.Designer.cs
index 5f282702bb0..e69de29bb2d 100644
--- a/src/Libraries/GeometryUI/Properties/Resources.en-US.Designer.cs
+++ b/src/Libraries/GeometryUI/Properties/Resources.en-US.Designer.cs
@@ -1 +0,0 @@
-
\ No newline at end of file
diff --git a/src/Libraries/GeometryUI/Properties/Resources.en-US.resx b/src/Libraries/GeometryUI/Properties/Resources.en-US.resx
index 192a649793a..4dde40ef7f3 100644
--- a/src/Libraries/GeometryUI/Properties/Resources.en-US.resx
+++ b/src/Libraries/GeometryUI/Properties/Resources.en-US.resx
@@ -117,6 +117,9 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="ExportToSATDescripiton" xml:space="preserve">
+    <value>Exports the specified geometry to the given SAT  file path.</value>
+  </data>
   <data name="ExportToSatFilePathDescription" xml:space="preserve">
     <value>File to export the geometry to.</value>
   </data>
diff --git a/src/Libraries/GeometryUI/Properties/Resources.resx b/src/Libraries/GeometryUI/Properties/Resources.resx
index 192a649793a..4dde40ef7f3 100644
--- a/src/Libraries/GeometryUI/Properties/Resources.resx
+++ b/src/Libraries/GeometryUI/Properties/Resources.resx
@@ -117,6 +117,9 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="ExportToSATDescripiton" xml:space="preserve">
+    <value>Exports the specified geometry to the given SAT  file path.</value>
+  </data>
   <data name="ExportToSatFilePathDescription" xml:space="preserve">
     <value>File to export the geometry to.</value>
   </data>
diff --git a/src/Libraries/Samples/SampleLibraryZeroTouch/Examples/BasicExample.cs b/src/Libraries/Samples/SampleLibraryZeroTouch/Examples/BasicExample.cs
index 9b980ff3668..79dffe95e96 100644
--- a/src/Libraries/Samples/SampleLibraryZeroTouch/Examples/BasicExample.cs
+++ b/src/Libraries/Samples/SampleLibraryZeroTouch/Examples/BasicExample.cs
@@ -148,13 +148,8 @@ public override string ToString()
         /// you to specify what is drawn when dynamo's visualization is
         /// updated.
         /// </summary>
-        /// <param name="package">The IRenderPackage object into which you push your render data</param>
-        /// <param name="tol">An optional tessellation tolerance which defines the resolution
-        /// of generated meshes for surfaces.</param>
-        /// <param name="maxGridLines">An optional tesselation tolerance which specifies the maximum number
-        /// of surface subdivisions to be used for tesselation.</param>
         [IsVisibleInDynamoLibrary(false)]
-        public void Tessellate(IRenderPackage package, double tol = -1, int maxGridLines = 512)
+        public void Tessellate(IRenderPackage package, TessellationParameters parameters)
         {
             // This example contains information to draw a point
             package.AddPointVertex(point.X, point.Y, point.Z);
diff --git a/src/Libraries/Samples/SampleLibraryZeroTouch/Examples/ColorExample.cs b/src/Libraries/Samples/SampleLibraryZeroTouch/Examples/ColorExample.cs
index d9090c9dcdd..fe8930376cd 100644
--- a/src/Libraries/Samples/SampleLibraryZeroTouch/Examples/ColorExample.cs
+++ b/src/Libraries/Samples/SampleLibraryZeroTouch/Examples/ColorExample.cs
@@ -16,7 +16,7 @@ public static CustomRenderExample Create()
         }
 
         [IsVisibleInDynamoLibrary(false)]
-        public void Tessellate(IRenderPackage package, double tol = -1, int maxGridLines = 512)
+        public void Tessellate(IRenderPackage package, TessellationParameters parameters)
         {
             // Dynamo's renderer uses IRenderPackage objects
             // to store data for rendering. The Tessellate method
diff --git a/src/Libraries/Samples/SampleLibraryZeroTouch/Examples/PeriodicUpdateExample.cs b/src/Libraries/Samples/SampleLibraryZeroTouch/Examples/PeriodicUpdateExample.cs
index b386067b57c..c7d9acca64f 100644
--- a/src/Libraries/Samples/SampleLibraryZeroTouch/Examples/PeriodicUpdateExample.cs
+++ b/src/Libraries/Samples/SampleLibraryZeroTouch/Examples/PeriodicUpdateExample.cs
@@ -72,7 +72,7 @@ public static PeriodicUpdateExample PointField()
         }
 
         [IsVisibleInDynamoLibrary(false)]
-        public void Tessellate(IRenderPackage package, double tol = -1, int maxGridLines = 512)
+        public void Tessellate(IRenderPackage package, TessellationParameters parameters)
         {
             for (var i = 0; i < width - 1; i++)
             {
diff --git a/src/Libraries/Tesellation/Adapters/Vertex2.cs b/src/Libraries/Tesellation/Adapters/Vertex2.cs
index d0fea1972eb..748d102251e 100644
--- a/src/Libraries/Tesellation/Adapters/Vertex2.cs
+++ b/src/Libraries/Tesellation/Adapters/Vertex2.cs
@@ -30,9 +30,9 @@ public Vertex2(double x, double y)
 
         public double[] Position { get; set; }
 
-        public void Tessellate(IRenderPackage package, double tol = -1, int maxGridLines = 512)
+        public void Tessellate(IRenderPackage package, TessellationParameters parameters)
         {
-            AsVector().Tessellate(package, tol, maxGridLines);
+            AsVector().Tessellate(package, parameters);
         }
     }
 }
\ No newline at end of file
diff --git a/src/Libraries/Tesellation/Adapters/Vertex3.cs b/src/Libraries/Tesellation/Adapters/Vertex3.cs
index 87a3581321d..1afa579b0ae 100644
--- a/src/Libraries/Tesellation/Adapters/Vertex3.cs
+++ b/src/Libraries/Tesellation/Adapters/Vertex3.cs
@@ -29,9 +29,9 @@ public Vertex3(double x, double y, double z)
 
         public double[] Position { get; set; }
 
-        public void Tessellate(IRenderPackage package, double tol = -1, int maxGridLines = 512)
+        public void Tessellate(IRenderPackage package, TessellationParameters parameters)
         {
-            AsVector().Tessellate(package, tol, maxGridLines);
+            AsVector().Tessellate(package, parameters);
         }
 
         public double NormSquared()
diff --git a/test/DynamoCoreTests/DSEvaluationModelTest.cs b/test/DynamoCoreTests/DSEvaluationModelTest.cs
index bbbf3b8d182..65e200fd628 100644
--- a/test/DynamoCoreTests/DSEvaluationModelTest.cs
+++ b/test/DynamoCoreTests/DSEvaluationModelTest.cs
@@ -958,6 +958,43 @@ public void TestDefaultArgumentTooltip()
             node.InPorts[0].UsingDefaultValue = false;
             Assert.IsTrue(node.InPorts[0].ToolTipContent.Equals("double\nDefault value : 0 (disabled)"));
         }
+        [Test]
+        public void Reorder_7573()
+        {
+            
+            // Original defect: http://adsk-oss.myjetbrains.com/youtrack/issue/MAGN-7573
+
+            var dynFilePath = Path.Combine(TestDirectory, @"core\dsevaluation\reorder.dyn");
+
+            RunModel(dynFilePath);
+
+            AssertPreviewValue("c739b941-ece7-4b87-ae69-9a16f04dbe5d", null);
+
+            // Reset engine and mark all nodes as dirty. A.k.a., force re-execute.
+            CurrentDynamoModel.ForceRun();
+
+            AssertPreviewValue("79d158b3-fa40-4069-8bb5-153e6fb13858", new object[] { 2, 3, 6, 5 });
+        }
+        [Test]
+        public void Removekey_7573()
+        {
+            
+            // Original defect: http://adsk-oss.myjetbrains.com/youtrack/issue/MAGN-7573
+
+            var dynFilePath = Path.Combine(TestDirectory, @"core\dsevaluation\removekey.dyn");
+
+            RunModel(dynFilePath);
+            // Fix expected result after MAGN-7639 is fixed.
+
+            AssertPreviewValue("bd89982a-c3e6-4a4e-898c-2bdc8f1f8c3e", false);
+
+            // Reset engine and mark all nodes as dirty. A.k.a., force re-execute.
+            CurrentDynamoModel.ForceRun();
+
+            // Fix expected result after MAGN-7639 is fixed.
+            AssertPreviewValue("980dcd47-84e7-412c-8d9e-d66f166d2370", new object[] { new object[] { false }, new object[] { false }, new object[] { false }, new object[] { false }, new object[] { false } });
+
+        }
     }
 
     [Category("DSCustomNode")]
@@ -1107,5 +1144,6 @@ public void Regress_Magn_4837()
 
             AssertPreviewValue("42693721-622d-475e-a82e-bfe793ddc153", new object[] {2, 3, 4, 5, 6});
         }
+        
     }
 }
diff --git a/test/DynamoCoreTests/DefaultArgumentTests.cs b/test/DynamoCoreTests/DefaultArgumentTests.cs
new file mode 100644
index 00000000000..293603acc3a
--- /dev/null
+++ b/test/DynamoCoreTests/DefaultArgumentTests.cs
@@ -0,0 +1,88 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using Dynamo.Nodes;
+using NUnit.Framework;
+
+namespace Dynamo.Tests
+{
+    class DefaultArgumentTests : DynamoModelTestBase
+    {
+        protected override void GetLibrariesToPreload(List<string> libraries)
+        {
+            libraries.Add("ProtoGeometry.dll");
+            libraries.Add("DSCoreNodes.dll");
+            
+            base.GetLibrariesToPreload(libraries);
+        }
+
+        [Test]
+        public void TestDefaultArgumentExpressionResolution()
+        {
+            // Simulate loading of external libraries in Dynamo by importing
+            // FFITarget AFTER preloading the standard set of libraries above
+            // By this time the default expressions using ProtoGeometry classes have already been resolved
+            string libraryPath = "FFITarget.dll";
+            
+            CurrentDynamoModel.LibraryServices.ImportLibrary(libraryPath);
+
+            string openPath = Path.Combine(TestDirectory,
+                @"core\dsevaluation\TestDefaultArgumentExpressionResolution.dyn");
+            OpenModel(openPath);
+
+            BeginRun();
+
+            // Assert that all nodes that use default argument expressions evaluate 
+            var result = CurrentDynamoModel.CurrentWorkspace.NodeFromWorkspace<DSFunction>(
+                Guid.Parse("3039c01a-a6cc-45db-a8c7-5b5369538456"));
+
+            Assert.IsTrue(result.CachedValue.Data != null);
+
+            result = CurrentDynamoModel.CurrentWorkspace.NodeFromWorkspace<DSFunction>(
+                Guid.Parse("d15314f9-0903-4709-b183-0f3c6b40a95f"));
+
+            Assert.IsTrue(result.CachedValue.Data != null);
+
+            result = CurrentDynamoModel.CurrentWorkspace.NodeFromWorkspace<DSFunction>(
+                Guid.Parse("f7620e76-3177-415b-9de5-939c47a727d7"));
+
+            Assert.IsTrue(result.CachedValue.Data != null);
+            
+            result = CurrentDynamoModel.CurrentWorkspace.NodeFromWorkspace<DSFunction>(
+                Guid.Parse("3b92db37-3646-429a-9ec0-2fc09d0d5643"));
+
+            Assert.IsTrue(result.CachedValue.Data != null);
+            
+        }
+
+        [Test]
+        public void TestDefaultArgumentExpressionResolutionWithConflict()
+        {
+            // Simulate loading of external libraries in Dynamo by importing
+            // FFITarget AFTER preloading the standard set of libraries above
+            // By this time the default expressions using ProtoGeometry classes have already been resolved
+            string libraryPath = "FFITarget.dll";
+
+            CurrentDynamoModel.LibraryServices.ImportLibrary(libraryPath);
+
+            string openPath = Path.Combine(TestDirectory,
+                @"core\dsevaluation\TestDefaultArgumentExpressionWithConflict.dyn");
+            OpenModel(openPath);
+
+            BeginRun();
+
+            // Assert that node using default argument expression with fully qualified Point class evaluates
+            var result = CurrentDynamoModel.CurrentWorkspace.NodeFromWorkspace<DSFunction>(
+                Guid.Parse("7335190b-f50b-4e99-8dc6-de9ff45426fe"));
+
+            Assert.IsTrue(result.CachedValue.Data != null);
+
+            // Assert that node using default argument expression with unqualified Point class throws warning
+            // due to conflicts in Point class
+            result = CurrentDynamoModel.CurrentWorkspace.NodeFromWorkspace<DSFunction>(
+                Guid.Parse("40623ca5-8bbb-427a-b014-a9ac40378b51"));
+
+            Assert.IsTrue(result.State == Models.ElementState.Warning);
+        }
+    }
+}
diff --git a/test/DynamoCoreTests/DynamoCoreTests.csproj b/test/DynamoCoreTests/DynamoCoreTests.csproj
index 8f9ddc3bf58..c76eef1df4f 100644
--- a/test/DynamoCoreTests/DynamoCoreTests.csproj
+++ b/test/DynamoCoreTests/DynamoCoreTests.csproj
@@ -63,6 +63,7 @@
     <Compile Include="CallsiteTests.cs" />
     <Compile Include="CrashProtectionTests.cs" />
     <Compile Include="DefaultArgumentMigrationTests.cs" />
+    <Compile Include="DefaultArgumentTests.cs" />
     <Compile Include="DSEvaluationUnitTestBase.cs" />
     <Compile Include="DynamoModelTestBase.cs" />
     <Compile Include="MessageLogTests.cs" />
diff --git a/test/DynamoCoreTests/LibraryTests.cs b/test/DynamoCoreTests/LibraryTests.cs
index faf57cb1ef7..0cdbbe2b42d 100644
--- a/test/DynamoCoreTests/LibraryTests.cs
+++ b/test/DynamoCoreTests/LibraryTests.cs
@@ -216,27 +216,6 @@ public void MethodWithRefOutParams_NoLoad()
             }
         }
 
-        [Test]
-        [Category("UnitTests")]
-        public void TestDefaultArgumentAttribute()
-        {
-            string libraryPath = "FFITarget.dll";
-            if (!libraryServices.IsLibraryLoaded(libraryPath))
-            {
-                libraryServices.ImportLibrary(libraryPath);
-            }
-
-            // Get function groups for ClassFunctionality Class
-            var functions = libraryServices.GetFunctionGroups(libraryPath)
-                                            .SelectMany(x => x.Functions)
-                                            .Where(y => y.ClassName.Contains("FFITarget.TestData") && y.FunctionName.Equals("GetCircleArea"));
-
-            Assert.IsTrue(functions.Any());
-            var func = functions.First();
-
-            Assert.IsTrue(func.Parameters.First().DefaultValue.ToString().Equals("TestData.GetFloat()"));
-        }
-
         #endregion
     }
 }
diff --git a/test/DynamoCoreWpfTests/AnnotationViewTests.cs b/test/DynamoCoreWpfTests/AnnotationViewTests.cs
index 06cd8d0c8d8..8871313ff94 100644
--- a/test/DynamoCoreWpfTests/AnnotationViewTests.cs
+++ b/test/DynamoCoreWpfTests/AnnotationViewTests.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Configuration;
 using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
@@ -29,6 +30,15 @@ public AnnotationView NodeViewWithGuid(string guid)
             return annotationViewOfType.First();
         }
 
+        public NodeView NodeModelViewWithGuid(string guid)
+        {
+            var nodeViews = View.NodeViewsInFirstWorkspace();
+            var nodeViewsOfType = nodeViews.Where(x => x.ViewModel.NodeLogic.GUID.ToString() == guid);
+            Assert.AreEqual(1, nodeViewsOfType.Count(), "Expected a single NodeView with guid: " + guid);
+
+            return nodeViewsOfType.First();
+        }
+
         public override void Open(string path)
         {
             base.Open(path);
@@ -92,5 +102,22 @@ public  void TestAnnotationMouseClickEvent()
             Assert.IsTrue(annotationView.GroupTextBlock.IsVisible);
 
         }
+
+        [Test]
+        public void TestAnnotationOnDummyNodes()
+        {
+            Open(@"UI\GroupDummyNodes.dyn");
+           
+            //check whether the Dummy nodes have the same GUID.
+            var nodeView = NodeModelViewWithGuid("de745c17-d6ef-4ff8-ac09-0d1703f58de5");
+            Assert.IsNotNull(nodeView);
+
+            //check whether there is a GROUP around Dummy nodes.
+            var annotationView = NodeViewWithGuid("ce97bb23-ad59-461b-ae81-17e8c48cf8de");
+            Assert.IsNotNull(annotationView);
+
+            var modelCount = annotationView.ViewModel.AnnotationModel.SelectedModels.Count();
+            Assert.AreEqual(1,modelCount);
+        }
     }
 }
diff --git a/test/DynamoCoreWpfTests/CoreUITests.cs b/test/DynamoCoreWpfTests/CoreUITests.cs
index d9d66baa606..00626b17f94 100644
--- a/test/DynamoCoreWpfTests/CoreUITests.cs
+++ b/test/DynamoCoreWpfTests/CoreUITests.cs
@@ -527,6 +527,39 @@ public void PreferenceSetting()
             View.Close();
         }
 
+        [Test]
+        public void PreferenceSettings_ShowEdges_DefaultFalse()
+        {
+            var settings = new PreferenceSettings();
+            Assert.False(settings.ShowEdges);
+        }
+
+        [Test]
+        public void PreferenceSettings_ShowEdges_Toggle()
+        {
+            ViewModel.RenderPackageFactoryViewModel.ShowEdges = false;
+            Assert.False(Model.PreferenceSettings.ShowEdges);
+
+            ViewModel.RenderPackageFactoryViewModel.ShowEdges = true;
+            Assert.True(Model.PreferenceSettings.ShowEdges);
+        }
+
+        [Test]
+        public void PreferenceSettings_ShowEdges_Save()
+        {
+            // Test if variable can be serialize and deserialize without any issue
+            string tempPath = System.IO.Path.GetTempPath();
+            tempPath = Path.Combine(tempPath, "userPreference.xml");
+
+            var initalSetting = new PreferenceSettings();
+            PreferenceSettings resultSetting;
+
+            initalSetting.ShowEdges = true;
+            initalSetting.Save(tempPath);
+            resultSetting = PreferenceSettings.Load(tempPath);
+            Assert.True(resultSetting.ShowEdges);
+        }
+
         private void RestartTestSetup(bool startInTestMode)
         {
             // Shutdown Dynamo and restart it
diff --git a/test/DynamoCoreWpfTests/DynamoCoreWpfTests.csproj b/test/DynamoCoreWpfTests/DynamoCoreWpfTests.csproj
index a9ed2cea0ca..bd8115298c2 100644
--- a/test/DynamoCoreWpfTests/DynamoCoreWpfTests.csproj
+++ b/test/DynamoCoreWpfTests/DynamoCoreWpfTests.csproj
@@ -106,6 +106,7 @@
     <Compile Include="PackageManager\PackageDependencyTests.cs" />
     <Compile Include="PackageManager\PackageManagerSearchViewModelTests.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="PublishPackageViewModelTests.cs" />
     <Compile Include="RecentFileTests.cs" />
     <Compile Include="RecordedTests.cs" />
     <Compile Include="RunSettingsTests.cs" />
diff --git a/test/DynamoCoreWpfTests/NodePreviewTests.cs b/test/DynamoCoreWpfTests/NodePreviewTests.cs
index e83e17a5ab7..df394d8982e 100644
--- a/test/DynamoCoreWpfTests/NodePreviewTests.cs
+++ b/test/DynamoCoreWpfTests/NodePreviewTests.cs
@@ -51,14 +51,14 @@ public void TurnGlobalPreviewOnAndOff()
             // Ensure we do have all the nodes we expected here.
             var nodes = nodeIds.Select(workspace.NodeFromWorkspace).ToList();
             Assert.IsFalse(nodes.Any(n => n == null)); // Nothing should be null.
-
+            
             // Ensure that the initial visibility is correct
             Assert.IsTrue(nodes.Select(n => n.IsVisible).SequenceEqual(new[]
             {
                 true, false, true, true
             }));
             // Ensure that visulations match our expectations
-            //Assert.AreEqual(2, BackgroundPreview.Points.Positions.Count);
+            Assert.AreEqual(2, workspace.TotalPointsToRender());
 
             // Now turn off the preview of all the nodes
             ViewModel.CurrentSpaceViewModel.SelectAllCommand.Execute(null);
@@ -69,7 +69,7 @@ public void TurnGlobalPreviewOnAndOff()
             {
                 false, false, false, false
             }));
-            //Assert.Null(BackgroundPreview.Points); // There should be no point left.
+            Assert.AreEqual(0, workspace.TotalPointsToRender());// There should be no point left.
 
             // Now turn on the preview of all the nodes
             ViewModel.CurrentSpaceViewModel.SelectAllCommand.Execute(null);
@@ -79,7 +79,7 @@ public void TurnGlobalPreviewOnAndOff()
             {
                 true, true, true, true
             }));
-            //Assert.AreEqual(3, BackgroundPreview.Points.Positions.Count);
+            Assert.AreEqual(3, workspace.TotalPointsToRender());
         }
 
         [Test]
@@ -108,24 +108,24 @@ public void SettingGlobalLacingStrategy()
             // Ensure that visulations match our expectations
             // Initially, all nodes has shortest lacing strategy
             // 5 points for point0 node, 2 points for point1 and point2 node
-            //Assert.AreEqual(9, BackgroundPreview.Points.Positions.Count);
+            Assert.AreEqual(9, workspace.TotalPointsToRender());
 
             // Modify lacing strategy
             ViewModel.CurrentSpaceViewModel.SelectAllCommand.Execute(null);
             ViewModel.CurrentSpaceViewModel.SetArgumentLacingCommand.Execute(LacingStrategy.Longest.ToString());
 
-            //Assert.AreEqual(12, BackgroundPreview.Points.Positions.Count);
+            Assert.AreEqual(12, workspace.TotalPointsToRender());
 
             // Modify lacing strategy again
             ViewModel.CurrentSpaceViewModel.SelectAllCommand.Execute(null);
             ViewModel.CurrentSpaceViewModel.SetArgumentLacingCommand.Execute(LacingStrategy.CrossProduct.ToString());
 
-            //Assert.AreEqual(17, BackgroundPreview.Points.Positions.Count);
+            Assert.AreEqual(17, workspace.TotalPointsToRender());
 
             // Change lacing back to original state
             ViewModel.CurrentSpaceViewModel.SelectAllCommand.Execute(null);
             ViewModel.CurrentSpaceViewModel.SetArgumentLacingCommand.Execute(LacingStrategy.Shortest.ToString());
-            //Assert.AreEqual(9, BackgroundPreview.Points.Positions.Count);
+            Assert.AreEqual(9, workspace.TotalPointsToRender());
         }
     }
 }
diff --git a/test/DynamoCoreWpfTests/NodeViewCustomizationTests.cs b/test/DynamoCoreWpfTests/NodeViewCustomizationTests.cs
index 2e865687ead..66753140c8c 100644
--- a/test/DynamoCoreWpfTests/NodeViewCustomizationTests.cs
+++ b/test/DynamoCoreWpfTests/NodeViewCustomizationTests.cs
@@ -68,8 +68,8 @@ public void Watch3DHasViewer()
             Open(@"UI\CoreUINodes.dyn");
 
             var nodeView = NodeViewWithGuid("6869c998-b819-4686-8849-6f36162c4182"); // NodeViewOf<Watch3D>();
-            var watchView = nodeView.ChildrenOfType<Watch3DView>().First();
-            //Assert.Null(watchView.Points);
+            var watchView = nodeView.ChildrenOfType<Watch3DView>().FirstOrDefault();
+            Assert.NotNull(watchView);
         }
 
         [Test]
@@ -279,6 +279,7 @@ public void Watch3DContainsExpectedGeometry()
             var watch3DView = watch3ds.First();
 
             //Assert.AreEqual(1, watch3DView.Points.Positions.Count);
+            Assert.AreEqual(1, Model.CurrentWorkspace.TotalPointsToRender());
         }
 
         [Test]
diff --git a/test/DynamoCoreWpfTests/PackageManagerUITests.cs b/test/DynamoCoreWpfTests/PackageManagerUITests.cs
index 81e5e3068be..130969c996b 100644
--- a/test/DynamoCoreWpfTests/PackageManagerUITests.cs
+++ b/test/DynamoCoreWpfTests/PackageManagerUITests.cs
@@ -10,6 +10,7 @@
 
 using NUnit.Framework;
 
+
 namespace DynamoCoreWpfTests
 {
     [TestFixture]
@@ -90,7 +91,6 @@ public void PackagePublishWindowClosesWithDynamo()
             AssertWindowClosedWithDynamoView<PublishPackageView>();
 
         }
-
         #endregion
 
         #region InstalledPackagesView
diff --git a/test/DynamoCoreWpfTests/PublishPackageViewModelTests.cs b/test/DynamoCoreWpfTests/PublishPackageViewModelTests.cs
new file mode 100644
index 00000000000..b9b1243df89
--- /dev/null
+++ b/test/DynamoCoreWpfTests/PublishPackageViewModelTests.cs
@@ -0,0 +1,42 @@
+using NUnit.Framework;
+using System.Linq;
+using Dynamo.PackageManager;
+using System.IO;
+using Dynamo.Tests;
+using System;
+
+namespace DynamoCoreWpfTests
+{
+     [TestFixture]
+    public class PublishPackageViewModelTests: DynamoViewModelUnitTest
+    {
+
+        [Test]
+        public void AddingDyfRaisesCanExecuteChangeOnDelegateCommand()
+        {
+            
+            var vm = new PublishPackageViewModel(ViewModel);
+            ViewModel.OnRequestPackagePublishDialog(vm);
+
+            //find a customnode to add to the package
+            string packagedirectory = Path.Combine(TestDirectory, "pkgs");
+            var packages = Directory.EnumerateDirectories(packagedirectory);
+            var first = Path.GetFullPath(packages.First());
+            string dyfpath = Path.Combine(first, "dyf");
+            var customnodes = Directory.GetFiles(dyfpath);
+            var firstnode = customnodes.First();
+
+            Console.WriteLine("add node at" + firstnode + "to package");
+
+            var canExecuteChangedFired = 0;
+            vm.SubmitCommand.CanExecuteChanged += ((o, e) => { canExecuteChangedFired++; });
+            //now add a customnode to the package
+            vm.AddFile(firstnode);
+
+            //assert that canExecute changed was fired one time 
+            Assert.AreEqual(canExecuteChangedFired, 1);
+
+        }
+
+    }
+}
diff --git a/test/DynamoCoreWpfTests/RecordedTests.cs b/test/DynamoCoreWpfTests/RecordedTests.cs
index a7a79ccd9a9..2f202080965 100644
--- a/test/DynamoCoreWpfTests/RecordedTests.cs
+++ b/test/DynamoCoreWpfTests/RecordedTests.cs
@@ -5082,6 +5082,92 @@ public void MAGN_7348_Basket2()
             });
         }
         #endregion
+
+        [Test]
+        public void MAGN_7638_assignValueToVariable()
+        {
+            // Check whether connections are swapping after assigning
+            // value to variable
+            // Scenario
+            //  a) create -,/ node and connect the input with value 10,20;
+            //  b) assign input value to variable a and b,check the result
+            // issue link: http://adsk-oss.myjetbrains.com/youtrack/issue/MAGN-5453#
+
+
+            RunCommandsFromFile("MAGN-7638assignValueToVariable.xml", (commandTag) =>
+            {
+                var workspace = ViewModel.Model.CurrentWorkspace;
+                var divisorID = "2b213bb4-8d6f-4d82-86a7-29f83b6b9272";
+                var minusID = "6024f3ae-d6b7-4ee5-8dac-67100c631189";
+                switch (commandTag)
+                {
+                    case "FirstRun":
+
+                        //Check / ,-;
+                        AssertPreviewValue( divisorID,0.666667);
+                        AssertPreviewValue(minusID,-1);
+                        break;
+
+                    case "SecondRun":
+                        //Check / ,-;                       
+                        AssertPreviewValue(divisorID, 0.666667);
+                        AssertPreviewValue(minusID, -1);
+                        break;
+
+                }
+            });
+        }
+
+
+        [Test]
+        public void MAGN_7159_ImagePixel()
+        {
+            // Check Image.pixel
+            // Scenario
+            //  a) Connect nodes 
+            //  b) check image.Pixel
+            //  c) change input value and check image.Pixel
+            // http://adsk-oss.myjetbrains.com/youtrack/issue/MAGN-7159#
+            preloadGeometry = true;
+            RunCommandsFromFile("MAGN_7159_ImagePixel.xml", (commandTag) =>
+            {
+                var workspace = ViewModel.Model.CurrentWorkspace;
+                // give absolute path
+                string directory = Path.Combine(TestDirectory, @"core\recorded");
+                var textFileName = workspace.NodeFromWorkspace<DSCore.File.Filename>("3a22370f-7f07-4bd6-b4fb-5680ec82e8d4");
+                textFileName.Value = Path.Combine(directory, textFileName.Value);
+
+                switch (commandTag)
+                {
+                    case "FirstRun":
+
+                        //Check Image.Pixel
+                        AssertPreviewCount("e2f85c04-d992-41dd-8e0b-1def88f2c834", 4);
+                        var colorList = GetFlattenedPreviewValues("e2f85c04-d992-41dd-8e0b-1def88f2c834");
+                        foreach (var ele in colorList)
+                        {
+                            Assert.IsNotNull(ele);
+                        }
+                        NodeModel node1 = workspace.NodeFromWorkspace
+                              ("e2f85c04-d992-41dd-8e0b-1def88f2c834");
+                        Assert.AreEqual(ElementState.Active, node1.State);
+                        break;
+                    case "SecondRun":
+
+                        //Check Image.Pixel
+                        AssertPreviewCount("e2f85c04-d992-41dd-8e0b-1def88f2c834", 5);
+                        var colorListt = GetFlattenedPreviewValues("e2f85c04-d992-41dd-8e0b-1def88f2c834");
+                        foreach (var ele in colorListt)
+                        {
+                            Assert.IsNotNull(ele);
+                        }
+                        NodeModel node11 = workspace.NodeFromWorkspace
+                              ("e2f85c04-d992-41dd-8e0b-1def88f2c834");
+                        Assert.AreEqual(ElementState.Active, node11.State);
+                        break;
+                }
+            });
+        }
     }
 
 }
diff --git a/test/DynamoCoreWpfTests/VisualizationManagerUITests.cs b/test/DynamoCoreWpfTests/VisualizationManagerUITests.cs
index dc24c27e07e..8c682c490ad 100644
--- a/test/DynamoCoreWpfTests/VisualizationManagerUITests.cs
+++ b/test/DynamoCoreWpfTests/VisualizationManagerUITests.cs
@@ -2,32 +2,21 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Security.Permissions;
 using System.Windows.Media.Media3D;
-using System.Windows.Threading;
 using System.Xml;
-
 using SystemTestServices;
-
+using Autodesk.DesignScript.Interfaces;
 using Dynamo;
 using Dynamo.Controls;
-using Dynamo.DSEngine;
 using Dynamo.Models;
 using Dynamo.Nodes;
 using Dynamo.Selection;
 using Dynamo.UI;
-using Dynamo.Utilities;
-using Dynamo.Wpf;
-using Dynamo.Wpf.Rendering;
 using DynamoCoreWpfTests.Utility;
-
-using NUnit.Framework;
-
 using HelixToolkit.Wpf.SharpDX;
-using HelixToolkit.Wpf.SharpDX.Core;
-using ProtoCore.AST.AssociativeAST;
-
+using NUnit.Framework;
 using SharpDX;
+using Color = System.Windows.Media.Color;
 
 namespace DynamoCoreWpfTests
 {
@@ -49,16 +38,10 @@ private Watch3DView BackgroundPreview
         [Test]
         public void VisualizationManager_EmptyGraph_NothingRenders()
         {
-            var viz = ViewModel.VisualizationManager;
-
             var ws = ViewModel.Model.CurrentWorkspace as HomeWorkspaceModel;
             ws.RunSettings.RunType = RunType.Automatic;
 
-            // All collections will be null if there
-            // is nothing to visualize
-            //Assert.Null(BackgroundPreview.Points);
-            //Assert.Null(BackgroundPreview.Lines);
-            //Assert.Null(BackgroundPreview.Mesh);
+            Assert.False(ws.HasSomethingToRender());
         }
 
         [Test]
@@ -78,38 +61,37 @@ public void VisualizationManager_NodePreviewToggled_RenderingUpToDate()
             //we start with all previews disabled
             //the graph is two points feeding into a line
 
-            //ensure that visulations match our expectations
-            //Assert.AreEqual(7, BackgroundPreview.Points.Positions.Count);
-            //Assert.AreEqual(12, BackgroundPreview.Lines.Positions.Count);
-            Assert.AreEqual(0, BackgroundPreview.MeshCount);
+            Assert.AreEqual(7, ws.TotalPointsToRender());
+            Assert.AreEqual(6, ws.TotalLinesToRender());
+            Assert.AreEqual(0, ws.TotalMeshesToRender());
 
             //now flip off the preview on one of the points
             //and ensure that the visualization updates without re-running
             var p1 = model.CurrentWorkspace.Nodes.First(x => x.GUID.ToString() == "a7c70c13-cc62-41a6-85ed-dc42e788181d");
             p1.UpdateValue(new UpdateValueParams("IsVisible", "false"));
 
-            //Assert.AreEqual(1, BackgroundPreview.Points.Positions.Count);
-            //Assert.AreEqual(12, BackgroundPreview.Lines.Positions.Count);
-            Assert.AreEqual(0, BackgroundPreview.MeshCount);
+            Assert.AreEqual(1, ws.TotalPointsToRender());
+            Assert.AreEqual(6, ws.TotalLinesToRender());
+            Assert.AreEqual(0, ws.TotalMeshesToRender());
 
             //flip off the lines node
             var l1 = model.CurrentWorkspace.Nodes.First(x => x.GUID.ToString() == "7c1cecee-43ed-43b5-a4bb-5f71c50341b2");
             l1.UpdateValue(new UpdateValueParams("IsVisible", "false"));
 
-            //Assert.AreEqual(1, BackgroundPreview.Points.Positions.Count);
-            //Assert.Null(BackgroundPreview.Lines);
-            //Assert.Null(BackgroundPreview.Mesh);
+            Assert.AreEqual(1, ws.TotalPointsToRender());
+            Assert.AreEqual(0, ws.TotalLinesToRender());
+            Assert.AreEqual(0, ws.TotalMeshesToRender());
 
             //flip those back on and ensure the visualization returns
             p1.UpdateValue(new UpdateValueParams("IsVisible", "true"));
             l1.UpdateValue(new UpdateValueParams("IsVisible", "true"));
 
-            //Assert.AreEqual(7, BackgroundPreview.Points.Positions.Count);
-            //Assert.AreEqual(12, BackgroundPreview.Lines.Positions.Count);
-            //Assert.Null(BackgroundPreview.Mesh);
+            Assert.AreEqual(7, ws.TotalPointsToRender());
+            Assert.AreEqual(6, ws.TotalLinesToRender());
+            Assert.AreEqual(0, ws.TotalMeshesToRender());
         }
 
-        [Test]
+        [Test, Category("Failure")]
         public void VisualizationManager_PreviewUpstreamToggled_RenderingUpToDate()
         {
             var model = ViewModel.Model;
@@ -126,33 +108,30 @@ public void VisualizationManager_PreviewUpstreamToggled_RenderingUpToDate()
             //the graph is two points feeding into a line
 
             //ensure that visulations match our expectations
-            //Assert.AreEqual(7, BackgroundPreview.Points.Positions.Count);
-            //Assert.AreEqual(12, BackgroundPreview.Lines.Positions.Count);
-            //Assert.Null(BackgroundPreview.Mesh);
+            Assert.AreEqual(7, ws.TotalPointsToRender());
+            Assert.AreEqual(6, ws.TotalLinesToRender());
+            Assert.AreEqual(0, ws.TotalMeshesToRender());
+
+            // listen for the render complete event so
+            // we can inspect the packages sent to the watch3d node
+            var viz = ViewModel.VisualizationManager;
+            viz.ResultsReadyToVisualize += viz_ResultsReadyToVisualize;
 
             //flip off the line node's preview upstream
             var l1 = model.CurrentWorkspace.Nodes.First(x => x.GUID.ToString() == "7c1cecee-43ed-43b5-a4bb-5f71c50341b2");
             l1.UpdateValue(new UpdateValueParams("IsUpstreamVisible", "false"));
 
-            Assert.NotNull(model);
-            Assert.NotNull(model.CurrentWorkspace);
-
-            //ensure that the watch 3d is not showing the upstream
-            //the render descriptions will still be around for those
-            //nodes, but watch 3D will not be showing them
-            var nodeViews = View.NodeViewsInFirstWorkspace();
-            var watchNodes = nodeViews.OfNodeModelType<Watch3D>().ToList();
-            Assert.AreEqual(1, watchNodes.Count());
+            viz.ResultsReadyToVisualize -= viz_ResultsReadyToVisualize;
+        }
 
-            var watch3DNodeView = watchNodes.First();
-            if (!watch3DNodeView.PresentationGrid.Children().Any())
+        void viz_ResultsReadyToVisualize(VisualizationEventArgs args)
+        {
+            if (args.Id == Guid.Empty)
             {
-                // Watch3D views on nodes are disabled on CI without GPUs.
-                Assert.Inconclusive();
+                return;
             }
 
-            var watchView = watch3DNodeView.PresentationGrid.Children().First(c => c is Watch3DView) as Watch3DView;
-            //Assert.Null(watchView.Points);
+            Assert.AreEqual(0, args.Packages.Sum(rp=>rp.PointVertexCount));
         }
 
         [Test]
@@ -174,9 +153,8 @@ public void VisualizationManager_NodeDisconnected_NodeRendersAreCleared()
 
             //look at the data in the visualization manager
             //ensure that the number of Drawable nodes
-            //and the number of entries in the Dictionary match
-            //Assert.AreEqual(7, BackgroundPreview.Points.Positions.Count);
-            //Assert.AreEqual(6, BackgroundPreview.Lines.Positions.Count/2);
+            Assert.AreEqual(7, ws.TotalPointsToRender());
+            Assert.AreEqual(6, ws.TotalLinesToRender());
 
             //delete a conector coming into the lines node
             var lineNode =
@@ -187,15 +165,13 @@ public void VisualizationManager_NodeDisconnected_NodeRendersAreCleared()
 
             //ensure that the visualization no longer contains
             //the renderables for the line node
-            //Assert.AreEqual(7, BackgroundPreview.Points.Positions.Count);
-            //Assert.Null(BackgroundPreview.Lines);
+            Assert.AreEqual(7, ws.TotalPointsToRender());
+            Assert.AreEqual(0, ws.TotalLinesToRender());
         }
 
         [Test]
         public void VisualizationManager_Python_CreatesVisualizations()
         {
-            var viz = ViewModel.VisualizationManager;
-
             string openPath = Path.Combine(
                 GetTestDirectory(ExecutingDirectory),
                 @"core\visualization\ASM_python.dyn");
@@ -206,9 +182,8 @@ public void VisualizationManager_Python_CreatesVisualizations()
 
             //total points are the two strips of points at the top and
             //bottom of the mesh, duplicated 11x2x2 plus the one mesh
-            //Assert.AreEqual(1000, BackgroundPreview.Points.Positions.Count);
-            Assert.AreEqual(1000, BackgroundPreview.MeshCount);
-
+            Assert.AreEqual(1000, ws.TotalPointsToRender());
+            Assert.AreEqual(1000, ws.TotalMeshesToRender());
         }
 
         [Test]
@@ -228,7 +203,7 @@ public void VisualizationManager_NodeRemoved_VisualizationsDeleted()
             var ws = ViewModel.Model.CurrentWorkspace as HomeWorkspaceModel;
             ws.RunSettings.RunType = RunType.Automatic;
 
-            //Assert.AreEqual(6, BackgroundPreview.Points.Positions.Count);
+            Assert.AreEqual(6, ws.TotalPointsToRender());
 
             //delete a node and ensure that the renderables are cleaned up
             var pointNode =
@@ -239,7 +214,7 @@ public void VisualizationManager_NodeRemoved_VisualizationsDeleted()
 
             ViewModel.HomeSpace.HasUnsavedChanges = false;
 
-            //Assert.Null(BackgroundPreview.Points);
+            Assert.AreEqual(0, ws.TotalPointsToRender());
         }
 
         [Test]
@@ -256,13 +231,13 @@ public void VisualizationManager_WorkspaceCleared_RenderingCleared()
             ws.RunSettings.RunType = RunType.Automatic;
 
             //ensure that we have some visualizations
-            //Assert.Greater(BackgroundPreview.Points.Positions.Count, 0);
+            Assert.Greater(ws.TotalPointsToRender(), 0);
 
             //now clear the workspace
             model.ClearCurrentWorkspace();
 
             //ensure that we have no visualizations
-            //Assert.Null(BackgroundPreview.Points);
+            Assert.AreEqual(0, ws.TotalPointsToRender());
         }
 
         [Test]
@@ -274,11 +249,11 @@ public void VisualizationManager_WorkspaceOpened_RenderingCleared()
 
             // Make sure the workspace is running automatically.
             // Flipping the mode here will cause it to run.
-            var hws = model.CurrentWorkspace as HomeWorkspaceModel;
-            hws.RunSettings.RunType = RunType.Automatic;
+            var ws = model.CurrentWorkspace as HomeWorkspaceModel;
+            ws.RunSettings.RunType = RunType.Automatic;
 
             // Ensure we have some geometry
-            //Assert.Greater(BackgroundPreview.Points.Points.Count(), 0);
+            Assert.Greater(ws.TotalPointsToRender(),0);
 
             // Open a new file. It doesn't matter if the new file
             // is saved in Manual or Automatic, the act of clearing
@@ -288,7 +263,9 @@ public void VisualizationManager_WorkspaceOpened_RenderingCleared()
             openPath = Path.Combine(GetTestDirectory(ExecutingDirectory), @"core\visualization\ASM_thicken.dyn");
             Open(openPath);
 
-            //Assert.Null(BackgroundPreview.Points);
+            ws = model.CurrentWorkspace as HomeWorkspaceModel;
+
+            Assert.AreEqual(0, ws.TotalPointsToRender());
         }
 
         [Test]
@@ -311,7 +288,7 @@ public void VisualizationManager_CustomNodes_Render()
             ws.RunSettings.RunType = RunType.Automatic;
 
             //ensure that we have some visualizations
-            //Assert.Greater(BackgroundPreview.Points.Positions.Count, 0);
+            Assert.Greater(ws.TotalPointsToRender(), 0);
         }
 
         [Test]
@@ -327,7 +304,7 @@ public void VisualizationManager_Open_RemembersPreviewSaveState()
 
             //all nodes are set to not preview in the file
             //ensure that we have no visualizations
-            //Assert.Null(BackgroundPreview.Lines);
+            Assert.AreEqual(0, ws.TotalLinesToRender());
         }
 
         [Test]
@@ -360,21 +337,21 @@ public void VisualizationManager_Labels_Render()
             cbn.SetCodeContent("Autodesk.Point.ByCoordinates(a<1>,a<1>,a<1>);", elementResolver);
 
             // run the expression
-            Assert.True(BackgroundPreview.HasNumberOfPointVertices(4));
+            Assert.AreEqual(4, ws.TotalPointsToRender());
 
             //label displayed should be possible now because
             //some nodes have values. toggle on label display
             cbn.DisplayLabels = true;
-            Assert.True(BackgroundPreview.HasNumberOfTextObjects(4));
+            Assert.AreEqual(4, ws.TotalTextObjectsToRender());
 
             cbn.SetCodeContent("Autodesk.Point.ByCoordinates(a<1>,a<2>,a<3>);", elementResolver);
 
             Assert.DoesNotThrow(() => ViewModel.HomeSpace.Run());
-            Assert.True(BackgroundPreview.HasNumberOfPointVertices(64));
-            Assert.True(BackgroundPreview.HasNumberOfTextObjects(64));
+            Assert.AreEqual(64, ws.TotalPointsToRender());
+            Assert.AreEqual(64, ws.TotalTextObjectsToRender());
 
             cbn.DisplayLabels = false;
-            Assert.Null(BackgroundPreview.Text);
+            Assert.AreEqual(0, ws.TotalTextObjectsToRender());
         }
 
         [Test]
@@ -398,7 +375,7 @@ public void VisualizationManager_LabelsOnCurves_Render()
             var ws = ViewModel.Model.CurrentWorkspace as HomeWorkspaceModel;
             ws.RunSettings.RunType = RunType.Automatic;
 
-            Assert.True(BackgroundPreview.HasNumberOfLines(6));
+            Assert.AreEqual(6, ws.TotalLinesToRender());
 
             //label displayed should be possible now because
             //some nodes have values. toggle on label display
@@ -408,7 +385,7 @@ public void VisualizationManager_LabelsOnCurves_Render()
             Assert.IsNotNull(crvNode);
             crvNode.DisplayLabels = true;
 
-            Assert.True(BackgroundPreview.HasNumberOfTextObjects(6));
+            Assert.AreEqual(6, ws.TotalTextObjectsToRender());
         }
 
         [Test]
@@ -427,7 +404,7 @@ public void VisualizationManager_CustomNode_DoesNotRender()
             var ws = ViewModel.Model.CurrentWorkspace as HomeWorkspaceModel;
             ws.RunSettings.RunType = RunType.Automatic;
 
-            //Assert.AreEqual(1, BackgroundPreview.Lines.Positions.Count / 2);
+            Assert.AreEqual(1, ws.TotalLinesToRender());
 
             // Convert a DSFunction node Line.ByPointDirectionLength to custom node.
             var workspace = model.CurrentWorkspace;
@@ -449,14 +426,15 @@ public void VisualizationManager_CustomNode_DoesNotRender()
 
             // Switch to custom workspace
             model.OpenCustomNodeWorkspace(customWorkspace.CustomNodeId);
+            var customSpace = Model.CurrentWorkspace;
 
             // Select that node
             DynamoSelection.Instance.Selection.Add(node);
 
             // No preview in the background
-            //Assert.Null(BackgroundPreview.Points);
-            //Assert.Null(BackgroundPreview.Lines);
-            //Assert.Null(BackgroundPreview.Mesh);
+            Assert.AreEqual(0, customSpace.TotalPointsToRender());
+            Assert.AreEqual(0, customSpace.TotalLinesToRender());
+            Assert.AreEqual(0, customSpace.TotalMeshesToRender());
         }
 
         [Test]
@@ -470,7 +448,7 @@ public void VisualizationManager_Solids_Render()
             var ws = ViewModel.Model.CurrentWorkspace as HomeWorkspaceModel;
             ws.RunSettings.RunType = RunType.Automatic;
 
-            Assert.True(BackgroundPreview.HasMeshes());
+            Assert.True(ws.HasAnyMeshes());
 
             ViewModel.HomeSpace.HasUnsavedChanges = false;
         }
@@ -486,7 +464,7 @@ public void VisualizationManager_Surfaces_Render()
             var ws = ViewModel.Model.CurrentWorkspace as HomeWorkspaceModel;
             ws.RunSettings.RunType = RunType.Automatic;
 
-            Assert.True(BackgroundPreview.HasNumberOfMeshVertices(36));
+            Assert.AreEqual(36, ws.TotalMeshVerticesToRender());
         }
 
         [Test]
@@ -500,9 +478,9 @@ public void VisualizationManager_CoordinateSystems_Render()
             var ws = ViewModel.Model.CurrentWorkspace as HomeWorkspaceModel;
             ws.RunSettings.RunType = RunType.Automatic;
 
-            Assert.True(BackgroundPreview.HasNumberOfLinesOfColor(1, new SharpDX.Color4(1f, 0f, 0f, 1f)));
-            Assert.True(BackgroundPreview.HasNumberOfLinesOfColor(1, new SharpDX.Color4(0f,1f,0f,1f)));
-            Assert.True(BackgroundPreview.HasNumberOfLinesOfColor(1, new SharpDX.Color4(0f,0f,1f,1f)));
+            Assert.AreEqual(1, ws.TotalLinesOfColorToRender(new Color4(1f, 0f, 0f, 1f)));
+            Assert.AreEqual(1, ws.TotalLinesOfColorToRender(new Color4(0f, 1f, 0f, 1f)));
+            Assert.AreEqual(1, ws.TotalLinesOfColorToRender(new Color4(0f, 0f, 1f, 1f)));
         }
 
         [Test]
@@ -527,44 +505,15 @@ public void VisualizationManager_Planes_Render()
             // 30 mesh vertices
             //ensure that the number of visualizations matches the 
             //number of pieces of geometry in the collection
-            //Assert.AreEqual(numberOfPlanes * numberOfVertsPerTri * numberOfTrisPerPlane, BackgroundPreview.PerVertexMesh.Positions.Count);
-            var testColor = new SharpDX.Color4(0, 0, 0, 10.0f/255.0f);
-            //Assert.True(BackgroundPreview.PerVertexMesh.Colors.All(c => c == testColor));
+            Assert.AreEqual(numberOfPlanes * numberOfVertsPerTri * numberOfTrisPerPlane, ws.TotalMeshVerticesToRender());
+
+            var testColor = new Color4(0, 0, 0, 10.0f/255.0f);
+            Assert.True(ws.HasMeshVerticesAllOfColor(testColor));
 
             // Increase the number of planes
             numberOfPlanes = numberOfPlanes + 5;
             numberOfPlanesNode.Value = numberOfPlanes.ToString();
-            //Assert.AreEqual(numberOfPlanes * numberOfVertsPerTri * numberOfTrisPerPlane, BackgroundPreview.PerVertexMesh.Positions.Count);
-        }
-
-        [Test]
-        public void VisualizationManager_Points_Render()
-        {
-            var model = ViewModel.Model;
-            var viz = ViewModel.VisualizationManager;
-
-            string openPath = Path.Combine(
-                GetTestDirectory(ExecutingDirectory),
-                @"core\visualization\ASM_points.dyn");
-            Open(openPath);
-
-            // check all the nodes and connectors are loaded
-            Assert.AreEqual(4, model.CurrentWorkspace.Nodes.Count);
-            Assert.AreEqual(4, model.CurrentWorkspace.Connectors.Count());
-
-            var ws = ViewModel.Model.CurrentWorkspace as HomeWorkspaceModel;
-            ws.RunSettings.RunType = RunType.Automatic;
-
-            //ensure that the number of visualizations matches the 
-            //number of pieces of geometry in the collection
-            //Assert.AreEqual(GetTotalDrawablesInModel(), BackgroundPreview.Points.Positions.Count);
-
-            //adjust the number node's value - currently set to 0..5 (6 elements)
-            var numNode = (DoubleInput)model.CurrentWorkspace.Nodes.First(x => x is DoubleInput);
-            numNode.Value = "0..10";
-            ViewModel.HomeSpace.Run();
-
-            //Assert.AreEqual(GetTotalDrawablesInModel(), BackgroundPreview.Points.Positions.Count);
+            Assert.AreEqual(numberOfPlanes * numberOfVertsPerTri * numberOfTrisPerPlane, ws.TotalMeshVerticesToRender());
         }
 
         [Test]
@@ -651,23 +600,36 @@ public void Watch3D_SwitchWorkspaceType_BackgroundColorIsCorrect()
             var ws = ViewModel.Model.CurrentWorkspace as HomeWorkspaceModel;
             ws.RunSettings.RunType = RunType.Automatic;
 
-            var homeColor = (System.Windows.Media.Color) SharedDictionaryManager.DynamoColorsAndBrushesDictionary["WorkspaceBackgroundHome"];
+            var homeColor = (Color) SharedDictionaryManager.DynamoColorsAndBrushesDictionary["WorkspaceBackgroundHome"];
 
             Assert.AreEqual(BackgroundPreview.watch_view.BackgroundColor, homeColor.ToColor4());
 
             Open(customNodePath);
 
-            var customColor = (System.Windows.Media.Color)SharedDictionaryManager.DynamoColorsAndBrushesDictionary["WorkspaceBackgroundCustom"];
+            var customColor = (Color)SharedDictionaryManager.DynamoColorsAndBrushesDictionary["WorkspaceBackgroundCustom"];
 
             Assert.AreEqual(BackgroundPreview.watch_view.BackgroundColor, customColor.ToColor4());
         }
 
-        private int GetTotalDrawablesInModel()
+        [Test]
+        public void ViewSettings_ShowEdges_Toggled_GeometryIsCorrect()
         {
-            return
-                ViewModel.Model.CurrentWorkspace.Nodes.SelectMany(x => x.RenderPackages)
-                    .Where(x => x.HasRenderingData).Cast<HelixRenderPackage>()
-                    .Aggregate(0, (a, b) => a + b.Points.Points.Count() + (b.Mesh.Positions.Any() ? 1 : 0) + (b.Lines.Positions.Any() ? 1 : 0));
+            string openPath = Path.Combine(
+                GetTestDirectory(ExecutingDirectory),
+                @"core\visualization\ASM_cuboid.dyn");
+            Open(openPath);
+
+            var ws = ViewModel.Model.CurrentWorkspace as HomeWorkspaceModel;
+            ws.RunSettings.RunType = RunType.Automatic;
+
+            ViewModel.RenderPackageFactoryViewModel.ShowEdges = false;
+            Assert.AreEqual(0, ws.TotalLinesToRender());
+
+            ViewModel.RenderPackageFactoryViewModel.ShowEdges = true;
+            Assert.AreEqual(12, ws.TotalLinesToRender());
+
+            ViewModel.RenderPackageFactoryViewModel.ShowEdges = false;
+            Assert.AreEqual(0, ws.TotalLinesToRender());
         }
 
         private void Open(string relativePath)
@@ -677,73 +639,122 @@ private void Open(string relativePath)
         }
     }
 
-    internal static class Watch3DViewExtensions
+    internal static class WorkspaceExtensions
     {
-        public static bool HasNumberOfLinesOfColor(this Watch3DView view, int lineCount, Color4 color)
-        {                  
-            var lines = view.GeometryValuesWithoutConstants.Where(x => x is LineGeometryModel3D).ToList().Cast<LineGeometryModel3D>().ToList();
-            var lineColor = lines.Select(x => x.Geometry.Colors);
-            int count = 0;
-            foreach (var lc in lineColor)
-            {
-                count = lc.Count(x => x == color);
-            }
+        public static int TotalLinesOfColorToRender(this WorkspaceModel workspace, Color4 color)
+        {
+            var colorLineCount = workspace.Nodes.
+                SelectMany(n=>n.RenderPackages).
+                Where(rp=>rp.LineVertexCount > 0).
+                Sum(rp => rp.TotalCurvesOfColor(color));
 
-            return count == lineCount * 2;           
+            return colorLineCount;
         }
 
-        public static bool HasNumberOfPointVertices(this Watch3DView view, int numberOfPoints)
+        public static int TotalPointsToRender(this WorkspaceModel workspace)
         {
-            var points = view.GeometryValuesWithoutConstants.Where(x => x is PointGeometryModel3D).ToList().Cast<PointGeometryModel3D>().ToList();
-            var pointPositions = points.Select(x => x.Geometry.Positions);
-            int count = 0;
-            foreach (var pt in pointPositions)
-            {
-                count = pt.Count;
-            }
-            return count == numberOfPoints;
+            var vertexCount = workspace.Nodes.
+                SelectMany(n => n.RenderPackages).
+                Sum(rp => rp.PointVertexCount);
+
+            return vertexCount;
         }
 
-        public static bool HasNumberOfTextObjects(this Watch3DView view, int numberOfTextObjects)
+        public static int TotalTextObjectsToRender(this WorkspaceModel workspace)
         {
-            return view.Text.TextInfo.Count == numberOfTextObjects;
+            var labelledPackages = workspace.Nodes.
+                SelectMany(n => n.RenderPackages).
+                Where(rp=>rp.DisplayLabels).ToArray();
+
+            int total = 0;
+
+            total += labelledPackages.
+                Where(rp=>rp.PointVertexCount > 0).
+                Sum(rp => rp.PointVertexCount);
+
+            total += labelledPackages.
+                Where(rp=>rp.LineVertexCount > 0).
+                Sum(rp => rp.LineStripVertexCounts.Count(c => c >0));
+
+            total += labelledPackages.Count(rp => rp.MeshVertexCount > 0);
+
+            return total;
         }
 
-        public static bool HasMeshes(this Watch3DView view)
+        public static int TotalMeshesToRender(this WorkspaceModel workspace)
         {
-            var mesh = view.GeometryValuesWithoutConstants.Where(x => x is DynamoGeometryModel3D).ToList().Cast<DynamoGeometryModel3D>().ToList();
-            var meshPositions = mesh.Select(x => x.Geometry.Positions);
-            int count = 0;
-            foreach (var msp in meshPositions)
-            {
-                count = msp.Count;
-            }
-            return count > 0;  
+            return workspace.Nodes.SelectMany(n => n.RenderPackages).Count(rp => rp.MeshVertexCount > 0);
+        }
+
+        public static bool HasAnyMeshes(this WorkspaceModel workspace)
+        {
+            return workspace.Nodes.SelectMany(n => n.RenderPackages).Any(rp => rp.MeshVertexCount > 0);
+        }
+
+        public static bool HasMeshVerticesAllOfColor(this WorkspaceModel workspace, Color4 color)
+        {
+            return workspace.Nodes.SelectMany(n => n.RenderPackages)
+                .All(rp => rp.MeshVertexColors.IsArrayOfColor(color));
+        }
+
+        public static int TotalMeshVerticesToRender(this WorkspaceModel workspace)
+        {
+            return workspace.Nodes.SelectMany(n => n.RenderPackages).Sum(rp => rp.MeshVertexCount);
         }
 
-        public static bool HasNumberOfMeshVertices(this Watch3DView view, int numberOfVertices)
+        public static int TotalLinesToRender(this WorkspaceModel workspace)
         {
-            var mesh = view.GeometryValuesWithoutConstants.Where(x => x is DynamoGeometryModel3D).ToList().Cast<DynamoGeometryModel3D>().ToList();
-            var meshPositions = mesh.Select(x => x.Geometry.Positions);
-            int count = 0;
-            foreach (var msp in meshPositions)
+            return workspace.Nodes.
+                SelectMany(n => n.RenderPackages).
+                Where(rp=>rp.LineStripVertexCounts.Any()).
+                Sum(rp => rp.LineStripVertexCounts.Count(c => c > 0));
+        }
+
+        public static bool HasSomethingToRender(this WorkspaceModel workspace)
+        {
+            var allPackages = workspace.Nodes.
+                SelectMany(n => n.RenderPackages);
+
+            return allPackages.Any();
+        }
+
+        private static int TotalCurvesOfColor(this IRenderPackage package, Color4 color)
+        {
+            var count = 0;
+            var idx = 0;
+            for (var i = 0; i < package.LineStripVertexCounts.Count(); i++)
             {
-                count = msp.Count;
+                var currCount = package.LineStripVertexCounts.ElementAt(i);
+                if (currCount == 0) continue;
+
+                var colorBytes = package.LineStripVertexColors.Skip(idx).Take(currCount*4);
+                if (colorBytes.IsArrayOfColor(color))
+                {
+                    count++;
+                }
+                idx += currCount*4;
             }
-            return count == numberOfVertices;  
+
+            return count;
         }
 
-        public static bool HasNumberOfLines(this Watch3DView view, int numberOfLines)
+        private static bool IsArrayOfColor(this IEnumerable<byte> colorBytes, Color4 color)
         {
-            var lines = view.GeometryValuesWithoutConstants.Where(x => x is LineGeometryModel3D).ToList().Cast<LineGeometryModel3D>().ToList();
-            var linePositions = lines.Select(x => x.Geometry.Positions);
-            int count = 0;
-            foreach (var ln in linePositions)
+            var colorArr = colorBytes.ToArray();
+
+            for (var i = 0; i < colorArr.Count(); i += 4)
             {
-                count = ln.Count;
+                var r = colorArr[i] == (byte)(color.Red * 255);
+                var g = colorArr[i+1] == (byte)(color.Green * 255);
+                var b = colorArr[i+2] == (byte)(color.Blue * 255);
+                var a = colorArr[i+3] == (byte)(color.Alpha * 255);
+                if (!a || !r || !g || !b)
+                {
+                    return false;
+                }
             }
-            return count == numberOfLines * 2;           
+            
+            return true;
         }
     }
-
 }
diff --git a/test/Engine/FFITarget/FFITarget.csproj b/test/Engine/FFITarget/FFITarget.csproj
index 8bc685e59d8..a710ebab34e 100644
--- a/test/Engine/FFITarget/FFITarget.csproj
+++ b/test/Engine/FFITarget/FFITarget.csproj
@@ -68,6 +68,7 @@
     <Compile Include="OverloadTarget.cs" />
     <Compile Include="ProtoFFITests.cs" />
     <Compile Include="RegressionTargets.cs" />
+    <Compile Include="TestDefaultArgumentAttributes.cs" />
     <Compile Include="TestMessageLog.cs" />
     <Compile Include="TestNamespaceConflict.cs" />
     <Compile Include="TestNamespaceResolution.cs" />
diff --git a/test/Engine/FFITarget/ProtoFFITests.cs b/test/Engine/FFITarget/ProtoFFITests.cs
index 37bfc68b47c..f665a315a88 100644
--- a/test/Engine/FFITarget/ProtoFFITests.cs
+++ b/test/Engine/FFITarget/ProtoFFITests.cs
@@ -939,6 +939,11 @@ public static Point XYZ(double x, double y, double z)
                 return p;
             }
 
+            public static Point ByCoordinates(double x, double y, double z)
+            {
+                return XYZ(x, y, z);
+            }
+
             public double dX { get; set; }
             public double dY { get; set; }
             public double dZ { get; set; }
diff --git a/test/Engine/FFITarget/TestDefaultArgumentAttributes.cs b/test/Engine/FFITarget/TestDefaultArgumentAttributes.cs
new file mode 100644
index 00000000000..dcf6b6d9862
--- /dev/null
+++ b/test/Engine/FFITarget/TestDefaultArgumentAttributes.cs
@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using Autodesk.DesignScript.Runtime;
+using FFITarget.DesignScript;
+
+namespace FFITarget
+{
+   
+    public class TestDefaultArgumentAttributes
+    {
+        public static double ComputeCircle([DefaultArgument("FFITarget.DesignScript.Point.ByCoordinates(0, 0, 0)")]Point centerPoint, double radius = 1)
+        {
+            return radius * radius * Math.PI;
+        }
+
+        public static double ComputeCircleConflict([DefaultArgument("Point.ByCoordinates(0, 0, 0)")]Point centerPoint, double radius = 1)
+        {
+            return radius * radius * Math.PI;
+        }
+    }
+}
diff --git a/test/Libraries/DisplayTests/ByGeometryColorTests.cs b/test/Libraries/DisplayTests/ByGeometryColorTests.cs
new file mode 100644
index 00000000000..5075fc80141
--- /dev/null
+++ b/test/Libraries/DisplayTests/ByGeometryColorTests.cs
@@ -0,0 +1,11 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+namespace DisplayTests
+{
+    public class ByGeometryColorTests
+    {
+    }
+}
diff --git a/test/Libraries/DisplayTests/BySurfaceUvsColorsTests.cs b/test/Libraries/DisplayTests/BySurfaceUvsColorsTests.cs
new file mode 100644
index 00000000000..d7d0471c12d
--- /dev/null
+++ b/test/Libraries/DisplayTests/BySurfaceUvsColorsTests.cs
@@ -0,0 +1,104 @@
+using System;
+using System.Collections.Generic;
+using Autodesk.DesignScript.Geometry;
+using DSCore;
+using NUnit.Framework;
+using TestServices;
+
+namespace DisplayTests
+{
+    [TestFixture]
+    public class BySurfaceUvsColorsTests : GeometricTestBase
+    {
+        [Test]
+        public void BySurfaceUVsColors_Construction_AllGood()
+        {
+            Assert.DoesNotThrow(()=>Display.Display.BySurfaceUvsColors(
+                CreateOneSurface(), CreateThreeUvs(), CreateThreeColors())); 
+        }
+
+        [Test]
+        public void BySurfaceUvsColors_Construction_NullSurface_ThrowsException()
+        {
+            Assert.Throws<ArgumentNullException>(() => Display.Display.BySurfaceUvsColors(
+                null, CreateThreeUvs(), CreateThreeColors()));
+        }
+
+        [Test]
+        public void BySurfaceUvsColors_Construction_NullUvs_ThrowsException()
+        {
+            Assert.Throws<ArgumentNullException>(() => Display.Display.BySurfaceUvsColors(
+                CreateOneSurface(), null, CreateThreeColors())); 
+        }
+
+        [Test]
+        public void BySurfaceUvsColors_Construction_EmptyUvs_ThrowsException()
+        {
+            Assert.Throws<ArgumentException>(() => Display.Display.BySurfaceUvsColors(
+                CreateOneSurface(), new UV[]{}, CreateThreeColors())); 
+        }
+
+        [Test]
+        public void BySurfaceUvsColors_Construction_PrecisionTooLow_ThrowsException()
+        {
+            Assert.Throws<Exception>(() => Display.Display.BySurfaceUvsColors(
+                CreateOneSurface(), CreateThreeUvs(), CreateThreeColors(), -42.0)); 
+        }
+
+        [Test]
+        public void BySurfaceUvsColors_Construction_PrecisionTooHigh_ThrowsException()
+        {
+            Assert.Throws<Exception>(() => Display.Display.BySurfaceUvsColors(
+                CreateOneSurface(), CreateThreeUvs(), CreateThreeColors(), 42.0)); 
+        }
+
+        [Test]
+        public void BySurfaceUvsColors_Construction_UvsColorsCountMismatch_ThrowsException()
+        {
+            Assert.Throws<Exception>(() => Display.Display.BySurfaceUvsColors(
+                CreateOneSurface(), CreateTwoUvs(), CreateThreeColors(), 42.0)); 
+        }
+
+        private static Surface CreateOneSurface()
+        {
+            var rect = Rectangle.ByWidthLength(5, 5);
+            var surface = Surface.ByPatch(rect);
+            return surface;
+        }
+
+        private static UV[] CreateThreeUvs()
+        {
+            var uvs = new[]
+            {
+                UV.ByCoordinates(0.2, 0.5),
+                UV.ByCoordinates(0.1, 0.9),
+                UV.ByCoordinates(0.9, 0.3)
+            };
+
+            return uvs;
+        }
+
+        private static UV[] CreateTwoUvs()
+        {
+            var uvs = new[]
+            {
+                UV.ByCoordinates(0.2, 0.5),
+                UV.ByCoordinates(0.1, 0.9),
+            };
+
+            return uvs;
+        }
+
+        private static Color[] CreateThreeColors()
+        {
+            var colors = new[]
+            {
+                Color.ByARGB(255, 255, 0, 0),
+                Color.ByARGB(255, 0, 255, 0),
+                Color.ByARGB(0, 0, 255)
+            };
+
+            return colors;
+        }
+    }
+}
diff --git a/test/Libraries/DisplayTests/DisplayTests.csproj b/test/Libraries/DisplayTests/DisplayTests.csproj
new file mode 100644
index 00000000000..e1e95927fb4
--- /dev/null
+++ b/test/Libraries/DisplayTests/DisplayTests.csproj
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <ImportGroup Label="PropertySheets">
+    <Import Project="$(SolutionDir)Config/CS.props" />
+  </ImportGroup>
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{F8D2E3E5-4505-4463-9367-2EB2629D7DCD}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>DisplayTests</RootNamespace>
+    <AssemblyName>DisplayTests</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>$(OutputPath)</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>$(OutputPath)</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="nunit.framework, Version=2.6.3.13283, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\extern\NUnit\nunit.framework.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="ProtoGeometry, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\extern\ProtoGeometry\ProtoGeometry.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="ProtoInterface, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\extern\ProtoGeometry\ProtoInterface.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="ByGeometryColorTests.cs" />
+    <Compile Include="BySurfaceUvsColorsTests.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Libraries\CoreNodes\CoreNodes.csproj">
+      <Project>{87550b2b-6cb8-461e-8965-dfafe3aafb5c}</Project>
+      <Name>CoreNodes</Name>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\..\src\Libraries\Display\Display.csproj">
+      <Project>{a50c198c-da6e-4081-bc53-0f44d287f207}</Project>
+      <Name>Display</Name>
+      <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\TestServices\TestServices.csproj">
+      <Project>{6cd0f0cf-8199-49f9-b0ea-0b9598b44419}</Project>
+      <Name>TestServices</Name>
+      <Private>False</Private>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
diff --git a/test/Libraries/DisplayTests/Properties/AssemblyInfo.cs b/test/Libraries/DisplayTests/Properties/AssemblyInfo.cs
new file mode 100644
index 00000000000..82832ab63e8
--- /dev/null
+++ b/test/Libraries/DisplayTests/Properties/AssemblyInfo.cs
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("DisplayTests")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("DisplayTests")]
+[assembly: AssemblyCopyright("Copyright ©  2015")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("1d46a730-9067-49eb-b880-29c24e98484b")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/test/Libraries/WorkflowTests/GeometryDefectTests.cs b/test/Libraries/WorkflowTests/GeometryDefectTests.cs
index 8743560ca2f..9dbb632ece8 100644
--- a/test/Libraries/WorkflowTests/GeometryDefectTests.cs
+++ b/test/Libraries/WorkflowTests/GeometryDefectTests.cs
@@ -487,8 +487,23 @@ public void TestExportWithUnits()
 
             Assert.IsTrue(exportPreview.Contains("exported.sat"));
         }
-     
 
-        
+        [Test]
+        public void TestCoordinateSystem()
+        {
+            //This test is use to test coordinate system
+            //Newly added Default arguments are missing for entire CoordinateSystem class.
+            //http://adsk-oss.myjetbrains.com/youtrack/issue/MAGN-7517
+            string openPath = Path.Combine(
+                TestDirectory,
+                @"core\geometryui\coordinateSystem.dyn");
+
+            RunModel(openPath);
+
+            var csPreview = GetPreviewValue("c7a317fc-c980-43f9-90c5-df50c9703f95") as CoordinateSystem;
+            Assert.AreEqual(0,csPreview.Origin.X );
+            Assert.AreEqual(0,csPreview.Origin.Y);
+            Assert.AreEqual(0, csPreview.Origin.Z); 
+        }       
     }
 }
diff --git a/test/UI/GroupDummyNodes.dyn b/test/UI/GroupDummyNodes.dyn
new file mode 100644
index 00000000000..bfeebcabf79
--- /dev/null
+++ b/test/UI/GroupDummyNodes.dyn
@@ -0,0 +1,14 @@
+<Workspace Version="0.8.2.1465" X="0" Y="0" zoom="1" Name="Home" RunType="Automatic" RunPeriod="1000" HasRunWithoutCrash="True">
+  <NamespaceResolutionMap />
+  <Elements>
+    <DSRevitNodesUI.FamilyTypes guid="071c6c11-5f7b-45f2-84e9-bd4c03a11f68" type="DSRevitNodesUI.FamilyTypes" nickname="Family Types" x="1634.67143029212" y="384.534732754884" isVisible="true" isUpstreamVisible="true" lacing="Disabled" index="39:Space Planning - Rectangle:Space Planning - Rectangle" />
+    <DSRevitNodesUI.ElementsOfCategory guid="de745c17-d6ef-4ff8-ac09-0d1703f58de5" type="DSRevitNodesUI.ElementsOfCategory" nickname="All Elements of Category" x="516.827951415609" y="221.723530753818" isVisible="true" isUpstreamVisible="true" lacing="Disabled" />
+  </Elements>
+  <Connectors />
+  <Notes />
+  <Annotations>
+    <Dynamo.Models.AnnotationModel guid="ce97bb23-ad59-461b-ae81-17e8c48cf8de" annotationText="&lt;Click here to edit the group title&gt;" left="506.827951415609" top="191.723530753818" width="264.8" height="136.2" fontSize="14" InitialTop="221.723530753818" InitialHeight="136.2" TextblockHeight="20" backgrouund="#FFC1D676">
+      <Models ModelGuid="de745c17-d6ef-4ff8-ac09-0d1703f58de5" />
+    </Dynamo.Models.AnnotationModel>
+  </Annotations>
+</Workspace>
\ No newline at end of file
diff --git a/test/core/dsevaluation/TestDefaultArgumentExpressionResolution.dyn b/test/core/dsevaluation/TestDefaultArgumentExpressionResolution.dyn
new file mode 100644
index 00000000000..9dbd5081be7
--- /dev/null
+++ b/test/core/dsevaluation/TestDefaultArgumentExpressionResolution.dyn
@@ -0,0 +1,29 @@
+<Workspace Version="0.8.2.1592" X="0" Y="0" zoom="1" Name="Home" RunType="Automatic" RunPeriod="1000" HasRunWithoutCrash="True">
+  <NamespaceResolutionMap />
+  <Elements>
+    <Dynamo.Nodes.DSFunction guid="3b92db37-3646-429a-9ec0-2fc09d0d5643" type="Dynamo.Nodes.DSFunction" nickname="Point.XYZ" x="280.5" y="450.5" isVisible="true" isUpstreamVisible="true" lacing="Shortest" assembly="..\..\..\bin\AnyCPU\Debug\FFITarget.dll" function="FFITarget.DesignScript.Point.XYZ@double,double,double" />
+    <Dynamo.Nodes.DSFunction guid="3039c01a-a6cc-45db-a8c7-5b5369538456" type="Dynamo.Nodes.DSFunction" nickname="Sphere.ByCenterPointRadius" x="108.5" y="33.5" isVisible="false" isUpstreamVisible="true" lacing="Shortest" assembly="ProtoGeometry.dll" function="Autodesk.DesignScript.Geometry.Sphere.ByCenterPointRadius@Autodesk.DesignScript.Geometry.Point,double">
+      <PortInfo index="0" default="True" />
+      <PortInfo index="1" default="True" />
+    </Dynamo.Nodes.DSFunction>
+    <Dynamo.Nodes.DSFunction guid="d15314f9-0903-4709-b183-0f3c6b40a95f" type="Dynamo.Nodes.DSFunction" nickname="Circle.ByCenterPointRadius" x="175.5" y="254.5" isVisible="true" isUpstreamVisible="true" lacing="Shortest" assembly="ProtoGeometry.dll" function="Autodesk.DesignScript.Geometry.Circle.ByCenterPointRadius@Autodesk.DesignScript.Geometry.Point,double">
+      <PortInfo index="0" default="True" />
+      <PortInfo index="1" default="True" />
+    </Dynamo.Nodes.DSFunction>
+    <Dynamo.Nodes.DSFunction guid="f7620e76-3177-415b-9de5-939c47a727d7" type="Dynamo.Nodes.DSFunction" nickname="Curve.Extrude" x="663.5" y="403.5" isVisible="true" isUpstreamVisible="true" lacing="Shortest" assembly="ProtoGeometry.dll" function="Autodesk.DesignScript.Geometry.Curve.Extrude@Autodesk.DesignScript.Geometry.Vector,double">
+      <PortInfo index="1" default="True" />
+      <PortInfo index="2" default="True" />
+    </Dynamo.Nodes.DSFunction>
+    <Dynamo.Nodes.CodeBlockNodeModel guid="ef945d97-685a-4d0f-8d63-46788e275f99" type="Dynamo.Nodes.CodeBlockNodeModel" nickname="Code Block" x="70" y="461" isVisible="true" isUpstreamVisible="true" lacing="Disabled" CodeText="1;" ShouldFocus="false" />
+    <Dynamo.Nodes.CodeBlockNodeModel guid="db3f0d31-09e0-46d4-900d-e730e030b467" type="Dynamo.Nodes.CodeBlockNodeModel" nickname="Code Block" x="21" y="601" isVisible="true" isUpstreamVisible="true" lacing="Disabled" CodeText="2;" ShouldFocus="false" />
+    <Dynamo.Nodes.CodeBlockNodeModel guid="d85390ad-e4d0-462c-a25a-bd03b223ab02" type="Dynamo.Nodes.CodeBlockNodeModel" nickname="Code Block" x="115" y="686" isVisible="true" isUpstreamVisible="true" lacing="Disabled" CodeText="3;" ShouldFocus="false" />
+  </Elements>
+  <Connectors>
+    <Dynamo.Models.ConnectorModel start="d15314f9-0903-4709-b183-0f3c6b40a95f" start_index="0" end="f7620e76-3177-415b-9de5-939c47a727d7" end_index="0" portType="0" />
+    <Dynamo.Models.ConnectorModel start="ef945d97-685a-4d0f-8d63-46788e275f99" start_index="0" end="3b92db37-3646-429a-9ec0-2fc09d0d5643" end_index="0" portType="0" />
+    <Dynamo.Models.ConnectorModel start="db3f0d31-09e0-46d4-900d-e730e030b467" start_index="0" end="3b92db37-3646-429a-9ec0-2fc09d0d5643" end_index="1" portType="0" />
+    <Dynamo.Models.ConnectorModel start="d85390ad-e4d0-462c-a25a-bd03b223ab02" start_index="0" end="3b92db37-3646-429a-9ec0-2fc09d0d5643" end_index="2" portType="0" />
+  </Connectors>
+  <Notes />
+  <Annotations />
+</Workspace>
\ No newline at end of file
diff --git a/test/core/dsevaluation/TestDefaultArgumentExpressionWithConflict.dyn b/test/core/dsevaluation/TestDefaultArgumentExpressionWithConflict.dyn
new file mode 100644
index 00000000000..af1cbb4c106
--- /dev/null
+++ b/test/core/dsevaluation/TestDefaultArgumentExpressionWithConflict.dyn
@@ -0,0 +1,16 @@
+<Workspace Version="0.8.2.1592" X="0" Y="0" zoom="1" Name="Home" RunType="Automatic" RunPeriod="1000" HasRunWithoutCrash="True">
+  <NamespaceResolutionMap />
+  <Elements>
+    <Dynamo.Nodes.DSFunction guid="7335190b-f50b-4e99-8dc6-de9ff45426fe" type="Dynamo.Nodes.DSFunction" nickname="TestDefaultArgumentAttributes.ComputeCircle" x="375.5" y="319.5" isVisible="true" isUpstreamVisible="true" lacing="Shortest" assembly="..\..\..\bin\AnyCPU\Debug\FFITarget.dll" function="FFITarget.TestDefaultArgumentAttributes.ComputeCircle@FFITarget.DesignScript.Point,double">
+      <PortInfo index="0" default="True" />
+      <PortInfo index="1" default="True" />
+    </Dynamo.Nodes.DSFunction>
+    <Dynamo.Nodes.DSFunction guid="40623ca5-8bbb-427a-b014-a9ac40378b51" type="Dynamo.Nodes.DSFunction" nickname="TestDefaultArgumentAttributes.ComputeCircleConflict" x="181.5" y="509.5" isVisible="true" isUpstreamVisible="true" lacing="Shortest" assembly="..\..\..\bin\AnyCPU\Debug\FFITarget.dll" function="FFITarget.TestDefaultArgumentAttributes.ComputeCircleConflict@FFITarget.DesignScript.Point,double">
+      <PortInfo index="0" default="True" />
+      <PortInfo index="1" default="True" />
+    </Dynamo.Nodes.DSFunction>
+  </Elements>
+  <Connectors />
+  <Notes />
+  <Annotations />
+</Workspace>
\ No newline at end of file
diff --git a/test/core/dsevaluation/removekey.dyn b/test/core/dsevaluation/removekey.dyn
new file mode 100644
index 00000000000..1763d11544f
--- /dev/null
+++ b/test/core/dsevaluation/removekey.dyn
@@ -0,0 +1,18 @@
+<Workspace Version="0.8.2.1594" X="-318.766568006852" Y="-60.1422250630171" zoom="0.762244377638742" Name="Home" RunType="Manual" RunPeriod="1000" HasRunWithoutCrash="True">
+  <NamespaceResolutionMap />
+  <Elements>
+    <Dynamo.Nodes.DSFunction guid="980dcd47-84e7-412c-8d9e-d66f166d2370" type="Dynamo.Nodes.DSFunction" nickname="RemoveKey" x="747.310179626332" y="155.321420986519" isVisible="true" isUpstreamVisible="true" lacing="Longest" assembly="" function="RemoveKey@var[]..[],var" />
+    <Dynamo.Nodes.CodeBlockNodeModel guid="259d923d-4c14-4ebc-9437-1ab198877c91" type="Dynamo.Nodes.CodeBlockNodeModel" nickname="Code Block" x="435.705330037962" y="294.443685627674" isVisible="true" isUpstreamVisible="true" lacing="Disabled" CodeText="1..5;" ShouldFocus="false" />
+    <Dynamo.Nodes.CodeBlockNodeModel guid="742e65ea-fd19-4643-b3a3-d951e01ad59f" type="Dynamo.Nodes.CodeBlockNodeModel" nickname="Code Block" x="542.110600983689" y="432.277814215451" isVisible="true" isUpstreamVisible="true" lacing="Disabled" CodeText="4;" ShouldFocus="false" />
+    <Dynamo.Nodes.DSFunction guid="bd89982a-c3e6-4a4e-898c-2bdc8f1f8c3e" type="Dynamo.Nodes.DSFunction" nickname="RemoveKey" x="787.196746844777" y="587.02450771216" isVisible="true" isUpstreamVisible="true" lacing="Shortest" assembly="" function="RemoveKey@var[]..[],var" />
+    <Dynamo.Nodes.CodeBlockNodeModel guid="f3ea0f4d-a881-4c40-b038-c7d9a8c09bbd" type="Dynamo.Nodes.CodeBlockNodeModel" nickname="Code Block" x="450.926297667508" y="554.386899895723" isVisible="true" isUpstreamVisible="true" lacing="Disabled" CodeText="null;" ShouldFocus="false" />
+  </Elements>
+  <Connectors>
+    <Dynamo.Models.ConnectorModel start="259d923d-4c14-4ebc-9437-1ab198877c91" start_index="0" end="980dcd47-84e7-412c-8d9e-d66f166d2370" end_index="0" portType="0" />
+    <Dynamo.Models.ConnectorModel start="742e65ea-fd19-4643-b3a3-d951e01ad59f" start_index="0" end="bd89982a-c3e6-4a4e-898c-2bdc8f1f8c3e" end_index="1" portType="0" />
+    <Dynamo.Models.ConnectorModel start="742e65ea-fd19-4643-b3a3-d951e01ad59f" start_index="0" end="980dcd47-84e7-412c-8d9e-d66f166d2370" end_index="1" portType="0" />
+    <Dynamo.Models.ConnectorModel start="f3ea0f4d-a881-4c40-b038-c7d9a8c09bbd" start_index="0" end="bd89982a-c3e6-4a4e-898c-2bdc8f1f8c3e" end_index="0" portType="0" />
+  </Connectors>
+  <Notes />
+  <Annotations />
+</Workspace>
\ No newline at end of file
diff --git a/test/core/dsevaluation/reorder.dyn b/test/core/dsevaluation/reorder.dyn
new file mode 100644
index 00000000000..4cfbc78cf7e
--- /dev/null
+++ b/test/core/dsevaluation/reorder.dyn
@@ -0,0 +1,19 @@
+<Workspace Version="0.8.2.1594" X="-121.815812232784" Y="11.7794713434604" zoom="0.784737952486217" Name="Home" RunType="Manual" RunPeriod="1000" HasRunWithoutCrash="False">
+  <NamespaceResolutionMap />
+  <Elements>
+    <Dynamo.Nodes.DSFunction guid="c739b941-ece7-4b87-ae69-9a16f04dbe5d" type="Dynamo.Nodes.DSFunction" nickname="Reorder" x="441.017988746927" y="90.7147474135925" isVisible="true" isUpstreamVisible="true" lacing="Longest" assembly="" function="Reorder@var[],var[]" />
+    <Dynamo.Nodes.CodeBlockNodeModel guid="60444879-4643-48c0-83b4-b7ab2b42adc2" type="Dynamo.Nodes.CodeBlockNodeModel" nickname="Code Block" x="248.53774214748" y="349.487222166938" isVisible="true" isUpstreamVisible="true" lacing="Disabled" CodeText="1..10;" ShouldFocus="false" />
+    <Dynamo.Nodes.CodeBlockNodeModel guid="94e29f41-376b-4206-ad54-63c012589bd0" type="Dynamo.Nodes.CodeBlockNodeModel" nickname="Code Block" x="244.634449314005" y="178.450434042835" isVisible="true" isUpstreamVisible="true" lacing="Disabled" CodeText="{1,2,5,4};" ShouldFocus="false" />
+    <Dynamo.Nodes.CodeBlockNodeModel guid="c1892233-f4ad-4922-af6f-ed361027181f" type="Dynamo.Nodes.CodeBlockNodeModel" nickname="Code Block" x="243.749349222392" y="91.5725441901859" isVisible="true" isUpstreamVisible="true" lacing="Disabled" CodeText="null;" ShouldFocus="false" />
+    <Dynamo.Nodes.DSFunction guid="79d158b3-fa40-4069-8bb5-153e6fb13858" type="Dynamo.Nodes.DSFunction" nickname="Reorder" x="455.994549059398" y="346.302249145124" isVisible="true" isUpstreamVisible="true" lacing="Longest" assembly="" function="Reorder@var[],var[]" />
+    <Dynamo.Nodes.CodeBlockNodeModel guid="c938e81e-37b9-4720-a8d8-86299345c95c" type="Dynamo.Nodes.CodeBlockNodeModel" nickname="Code Block" x="250.348021450983" y="455.657717362613" isVisible="true" isUpstreamVisible="true" lacing="Disabled" CodeText="{1,2,5,4};" ShouldFocus="false" />
+  </Elements>
+  <Connectors>
+    <Dynamo.Models.ConnectorModel start="60444879-4643-48c0-83b4-b7ab2b42adc2" start_index="0" end="79d158b3-fa40-4069-8bb5-153e6fb13858" end_index="0" portType="0" />
+    <Dynamo.Models.ConnectorModel start="94e29f41-376b-4206-ad54-63c012589bd0" start_index="0" end="c739b941-ece7-4b87-ae69-9a16f04dbe5d" end_index="1" portType="0" />
+    <Dynamo.Models.ConnectorModel start="c1892233-f4ad-4922-af6f-ed361027181f" start_index="0" end="c739b941-ece7-4b87-ae69-9a16f04dbe5d" end_index="0" portType="0" />
+    <Dynamo.Models.ConnectorModel start="c938e81e-37b9-4720-a8d8-86299345c95c" start_index="0" end="79d158b3-fa40-4069-8bb5-153e6fb13858" end_index="1" portType="0" />
+  </Connectors>
+  <Notes />
+  <Annotations />
+</Workspace>
\ No newline at end of file
diff --git a/test/core/geometryui/coordinateSystem.dyn b/test/core/geometryui/coordinateSystem.dyn
new file mode 100644
index 00000000000..28221c48be7
--- /dev/null
+++ b/test/core/geometryui/coordinateSystem.dyn
@@ -0,0 +1,11 @@
+<Workspace Version="0.8.2.1591" X="0" Y="0" zoom="1" Name="Home" RunType="Automatic" RunPeriod="1000" HasRunWithoutCrash="True">
+  <NamespaceResolutionMap />
+  <Elements>
+    <Dynamo.Nodes.DSFunction guid="c7a317fc-c980-43f9-90c5-df50c9703f95" type="Dynamo.Nodes.DSFunction" nickname="CoordinateSystem.ByOrigin" x="253" y="147" isVisible="true" isUpstreamVisible="true" lacing="Shortest" assembly="ProtoGeometry.dll" function="Autodesk.DesignScript.Geometry.CoordinateSystem.ByOrigin@Autodesk.DesignScript.Geometry.Point">
+      <PortInfo index="0" default="True" />
+    </Dynamo.Nodes.DSFunction>
+  </Elements>
+  <Connectors />
+  <Notes />
+  <Annotations />
+</Workspace>
\ No newline at end of file
diff --git a/test/core/recorded/MAGN-7638assignValueToVariable.xml b/test/core/recorded/MAGN-7638assignValueToVariable.xml
new file mode 100644
index 00000000000..3ec087bf466
--- /dev/null
+++ b/test/core/recorded/MAGN-7638assignValueToVariable.xml
@@ -0,0 +1,102 @@
+<Commands ExitAfterPlayback="true" PauseAfterPlaybackInMs="10" CommandIntervalInMs="20">
+  <CreateNodeCommand X="0" Y="0" DefaultPosition="true" TransformCoordinates="true">
+    <ModelGuid>2b213bb4-8d6f-4d82-86a7-29f83b6b9272</ModelGuid>
+    <Dynamo.Nodes.DSFunction guid="2b213bb4-8d6f-4d82-86a7-29f83b6b9272" type="Dynamo.Nodes.DSFunction" nickname="/" x="239.5" y="50.5" isVisible="true" isUpstreamVisible="true" lacing="Shortest" assembly="" function="/@var[]..[],var[]..[]" />
+  </CreateNodeCommand>
+  <CreateNodeCommand X="0" Y="0" DefaultPosition="true" TransformCoordinates="true">
+    <ModelGuid>6024f3ae-d6b7-4ee5-8dac-67100c631189</ModelGuid>
+    <Dynamo.Nodes.DSFunction guid="6024f3ae-d6b7-4ee5-8dac-67100c631189" type="Dynamo.Nodes.DSFunction" nickname="-" x="251.5" y="208.5" isVisible="true" isUpstreamVisible="true" lacing="Shortest" assembly="" function="-@var[]..[],var[]..[]" />
+  </CreateNodeCommand>
+  <SelectModelCommand Modifiers="0">
+    <ModelGuid>6024f3ae-d6b7-4ee5-8dac-67100c631189</ModelGuid>
+  </SelectModelCommand>
+  <DragSelectionCommand X="330" Y="192" DragOperation="0" />
+  <DragSelectionCommand X="314" Y="299" DragOperation="1" />
+  <SelectModelCommand Modifiers="0">
+    <ModelGuid>2b213bb4-8d6f-4d82-86a7-29f83b6b9272</ModelGuid>
+  </SelectModelCommand>
+  <DragSelectionCommand X="290" Y="170" DragOperation="0" />
+  <DragSelectionCommand X="279" Y="70" DragOperation="1" />
+  <SelectModelCommand Modifiers="0">
+    <ModelGuid>6024f3ae-d6b7-4ee5-8dac-67100c631189</ModelGuid>
+  </SelectModelCommand>
+  <DragSelectionCommand X="283" Y="309" DragOperation="0" />
+  <DragSelectionCommand X="276" Y="236" DragOperation="1" />
+  <SelectModelCommand Modifiers="0">
+    <ModelGuid>00000000-0000-0000-0000-000000000000</ModelGuid>
+  </SelectModelCommand>
+  <SelectInRegionCommand X="64" Y="143" Width="0" Height="0" IsCrossSelection="false" />
+  <CreateNodeCommand X="64" Y="143" DefaultPosition="false" TransformCoordinates="true">
+    <ModelGuid>4cd32f4c-8898-46e1-b7c6-62d84e8c8135</ModelGuid>
+    <Dynamo.Nodes.CodeBlockNodeModel guid="4cd32f4c-8898-46e1-b7c6-62d84e8c8135" type="Dynamo.Nodes.CodeBlockNodeModel" nickname="Code Block" x="40" y="88" isVisible="true" isUpstreamVisible="true" lacing="Disabled" CodeText="2;&#xA;3;" ShouldFocus="false" />
+  </CreateNodeCommand>
+  <SelectModelCommand Modifiers="0">
+    <ModelGuid>00000000-0000-0000-0000-000000000000</ModelGuid>
+  </SelectModelCommand>
+  <UpdateModelValueCommand Name="Code" Value="2;3" WorkspaceGuid="6e19a4a3-2a09-457c-93b2-7d6e268e46b2">
+    <ModelGuid>4cd32f4c-8898-46e1-b7c6-62d84e8c8135</ModelGuid>
+  </UpdateModelValueCommand>
+  <SelectModelCommand Modifiers="0">
+    <ModelGuid>00000000-0000-0000-0000-000000000000</ModelGuid>
+  </SelectModelCommand>
+  <SelectInRegionCommand X="54" Y="151" Width="0" Height="0" IsCrossSelection="false" />
+  <SelectModelCommand Modifiers="0">
+    <ModelGuid>4cd32f4c-8898-46e1-b7c6-62d84e8c8135</ModelGuid>
+  </SelectModelCommand>
+  <DragSelectionCommand X="33" Y="134" DragOperation="0" />
+  <DragSelectionCommand X="101" Y="110" DragOperation="1" />
+  <MakeConnectionCommand PortIndex="0" Type="1" ConnectionMode="0">
+    <ModelGuid>4cd32f4c-8898-46e1-b7c6-62d84e8c8135</ModelGuid>
+  </MakeConnectionCommand>
+  <MakeConnectionCommand PortIndex="0" Type="0" ConnectionMode="1">
+    <ModelGuid>2b213bb4-8d6f-4d82-86a7-29f83b6b9272</ModelGuid>
+  </MakeConnectionCommand>
+  <MakeConnectionCommand PortIndex="1" Type="0" ConnectionMode="0">
+    <ModelGuid>2b213bb4-8d6f-4d82-86a7-29f83b6b9272</ModelGuid>
+  </MakeConnectionCommand>
+  <MakeConnectionCommand PortIndex="1" Type="1" ConnectionMode="1">
+    <ModelGuid>4cd32f4c-8898-46e1-b7c6-62d84e8c8135</ModelGuid>
+  </MakeConnectionCommand>
+  <MakeConnectionCommand PortIndex="0" Type="1" ConnectionMode="0">
+    <ModelGuid>4cd32f4c-8898-46e1-b7c6-62d84e8c8135</ModelGuid>
+  </MakeConnectionCommand>
+  <MakeConnectionCommand PortIndex="0" Type="0" ConnectionMode="1">
+    <ModelGuid>6024f3ae-d6b7-4ee5-8dac-67100c631189</ModelGuid>
+  </MakeConnectionCommand>
+  <MakeConnectionCommand PortIndex="1" Type="1" ConnectionMode="0">
+    <ModelGuid>4cd32f4c-8898-46e1-b7c6-62d84e8c8135</ModelGuid>
+  </MakeConnectionCommand>
+  <MakeConnectionCommand PortIndex="1" Type="0" ConnectionMode="1">
+    <ModelGuid>6024f3ae-d6b7-4ee5-8dac-67100c631189</ModelGuid>
+  </MakeConnectionCommand>
+  <PausePlaybackCommand Tag="FirstRun" PauseDurationInMs="20" />
+  <SelectModelCommand Modifiers="0">
+    <ModelGuid>2b213bb4-8d6f-4d82-86a7-29f83b6b9272</ModelGuid>
+  </SelectModelCommand>
+  <DragSelectionCommand X="331" Y="144" DragOperation="0" />
+  <DragSelectionCommand X="331" Y="144" DragOperation="1" />
+  <SelectModelCommand Modifiers="0">
+    <ModelGuid>6024f3ae-d6b7-4ee5-8dac-67100c631189</ModelGuid>
+  </SelectModelCommand>
+  <SelectModelCommand Modifiers="0">
+    <ModelGuid>00000000-0000-0000-0000-000000000000</ModelGuid>
+  </SelectModelCommand>
+  <SelectInRegionCommand X="350" Y="313" Width="0" Height="0" IsCrossSelection="false" />
+  <SelectModelCommand Modifiers="0">
+    <ModelGuid>6024f3ae-d6b7-4ee5-8dac-67100c631189</ModelGuid>
+  </SelectModelCommand>
+  <DragSelectionCommand X="347" Y="310" DragOperation="0" />
+  <DragSelectionCommand X="347" Y="310" DragOperation="1" />
+  <SelectModelCommand Modifiers="0">
+    <ModelGuid>00000000-0000-0000-0000-000000000000</ModelGuid>
+  </SelectModelCommand>
+  <UpdateModelValueCommand Name="Code" Value="a = 2;&#xA;3;" WorkspaceGuid="6e19a4a3-2a09-457c-93b2-7d6e268e46b2">
+    <ModelGuid>4cd32f4c-8898-46e1-b7c6-62d84e8c8135</ModelGuid>
+  </UpdateModelValueCommand>
+  <SelectModelCommand Modifiers="0">
+    <ModelGuid>00000000-0000-0000-0000-000000000000</ModelGuid>
+  </SelectModelCommand>
+  <SelectInRegionCommand X="63" Y="247" Width="2" Height="0" IsCrossSelection="false" />
+  <RunCancelCommand ShowErrors="false" CancelRun="false" />
+  <PausePlaybackCommand Tag="SecondRun" PauseDurationInMs="20" />
+</Commands>
\ No newline at end of file
diff --git a/test/core/recorded/MAGN_7159_ImagePixel.xml b/test/core/recorded/MAGN_7159_ImagePixel.xml
new file mode 100644
index 00000000000..66d2e332dc1
--- /dev/null
+++ b/test/core/recorded/MAGN_7159_ImagePixel.xml
@@ -0,0 +1,145 @@
+<Commands ExitAfterPlayback="true" PauseAfterPlaybackInMs="10" CommandIntervalInMs="20">
+  <SelectModelCommand Modifiers="0">
+    <ModelGuid>00000000-0000-0000-0000-000000000000</ModelGuid>
+  </SelectModelCommand>
+  <SelectInRegionCommand X="89" Y="86" Width="0" Height="0" IsCrossSelection="false" />
+  <CreateNodeCommand X="89" Y="86" DefaultPosition="false" TransformCoordinates="true">
+    <ModelGuid>41efd68c-238c-47c6-a6f3-8aec3615e6ab</ModelGuid>
+    <Dynamo.Nodes.CodeBlockNodeModel guid="41efd68c-238c-47c6-a6f3-8aec3615e6ab" type="Dynamo.Nodes.CodeBlockNodeModel" nickname="Code Block" x="30" y="262" isVisible="true" isUpstreamVisible="true" lacing="Disabled" CodeText="4;" ShouldFocus="false" />
+  </CreateNodeCommand>
+  <SelectModelCommand Modifiers="0">
+    <ModelGuid>00000000-0000-0000-0000-000000000000</ModelGuid>
+  </SelectModelCommand>
+  <UpdateModelValueCommand Name="Code" Value="4" WorkspaceGuid="0435c788-4857-4e25-a34f-e9caa4941ee0">
+    <ModelGuid>41efd68c-238c-47c6-a6f3-8aec3615e6ab</ModelGuid>
+  </UpdateModelValueCommand>
+  <SelectModelCommand Modifiers="0">
+    <ModelGuid>00000000-0000-0000-0000-000000000000</ModelGuid>
+  </SelectModelCommand>
+  <SelectInRegionCommand X="127" Y="179" Width="1" Height="0" IsCrossSelection="true" />
+  <SelectModelCommand Modifiers="0">
+    <ModelGuid>41efd68c-238c-47c6-a6f3-8aec3615e6ab</ModelGuid>
+  </SelectModelCommand>
+  <DragSelectionCommand X="38" Y="81" DragOperation="0" />
+  <DragSelectionCommand X="71" Y="288" DragOperation="1" />
+  <CreateNodeCommand X="0" Y="0" DefaultPosition="true" TransformCoordinates="true">
+    <ModelGuid>3a22370f-7f07-4bd6-b4fb-5680ec82e8d4</ModelGuid>
+    <DSCore.File.Filename guid="3a22370f-7f07-4bd6-b4fb-5680ec82e8d4" type="DSCore.File.Filename" nickname="File Path" x="69.5" y="86.5" isVisible="true" isUpstreamVisible="true" lacing="Disabled">
+      <System.String>bug.PNG</System.String>
+    </DSCore.File.Filename>
+  </CreateNodeCommand>
+  <SelectModelCommand Modifiers="0">
+    <ModelGuid>3a22370f-7f07-4bd6-b4fb-5680ec82e8d4</ModelGuid>
+  </SelectModelCommand>
+  <DragSelectionCommand X="301" Y="169" DragOperation="0" />
+  <DragSelectionCommand X="120" Y="105" DragOperation="1" />
+  <CreateNodeCommand X="0" Y="0" DefaultPosition="true" TransformCoordinates="true">
+    <ModelGuid>db9816f9-fd62-4d10-9009-5955c259fd33</ModelGuid>
+    <DSCore.File.FileObject guid="db9816f9-fd62-4d10-9009-5955c259fd33" type="DSCore.File.FileObject" nickname="File.FromPath" x="267.5" y="99.5" isVisible="true" isUpstreamVisible="true" lacing="Disabled" />
+  </CreateNodeCommand>
+  <SelectModelCommand Modifiers="0">
+    <ModelGuid>db9816f9-fd62-4d10-9009-5955c259fd33</ModelGuid>
+  </SelectModelCommand>
+  <DragSelectionCommand X="315" Y="197" DragOperation="0" />
+  <DragSelectionCommand X="308" Y="122" DragOperation="1" />
+  <MakeConnectionCommand PortIndex="0" Type="1" ConnectionMode="0">
+    <ModelGuid>3a22370f-7f07-4bd6-b4fb-5680ec82e8d4</ModelGuid>
+  </MakeConnectionCommand>
+  <MakeConnectionCommand PortIndex="0" Type="0" ConnectionMode="1">
+    <ModelGuid>db9816f9-fd62-4d10-9009-5955c259fd33</ModelGuid>
+  </MakeConnectionCommand>
+  <CreateNodeCommand X="0" Y="0" DefaultPosition="true" TransformCoordinates="true">
+    <ModelGuid>3e733ecb-c699-4af7-84a5-825a4469ce09</ModelGuid>
+    <Dynamo.Nodes.DSFunction guid="3e733ecb-c699-4af7-84a5-825a4469ce09" type="Dynamo.Nodes.DSFunction" nickname="Image.ReadFromFile" x="417.5" y="95.5" isVisible="true" isUpstreamVisible="true" lacing="Shortest" assembly="DSCoreNodes.dll" function="DSCore.IO.Image.ReadFromFile@var" />
+  </CreateNodeCommand>
+  <MakeConnectionCommand PortIndex="0" Type="1" ConnectionMode="0">
+    <ModelGuid>db9816f9-fd62-4d10-9009-5955c259fd33</ModelGuid>
+  </MakeConnectionCommand>
+  <MakeConnectionCommand PortIndex="0" Type="0" ConnectionMode="1">
+    <ModelGuid>3e733ecb-c699-4af7-84a5-825a4469ce09</ModelGuid>
+  </MakeConnectionCommand>
+  <SelectModelCommand Modifiers="0">
+    <ModelGuid>3e733ecb-c699-4af7-84a5-825a4469ce09</ModelGuid>
+  </SelectModelCommand>
+  <DragSelectionCommand X="363" Y="219" DragOperation="0" />
+  <DragSelectionCommand X="482" Y="116" DragOperation="1" />
+  <CreateNodeCommand X="0" Y="0" DefaultPosition="true" TransformCoordinates="true">
+    <ModelGuid>172e2138-386a-4da1-87cc-43843b142d7b</ModelGuid>
+    <Dynamo.Nodes.WatchImageCore guid="172e2138-386a-4da1-87cc-43843b142d7b" type="Dynamo.Nodes.WatchImageCore" nickname="Watch Image" x="508.5" y="204.5" isVisible="true" isUpstreamVisible="true" lacing="Disabled" />
+  </CreateNodeCommand>
+  <SelectModelCommand Modifiers="0">
+    <ModelGuid>172e2138-386a-4da1-87cc-43843b142d7b</ModelGuid>
+  </SelectModelCommand>
+  <DragSelectionCommand X="414" Y="251" DragOperation="0" />
+  <DragSelectionCommand X="600" Y="233" DragOperation="1" />
+  <MakeConnectionCommand PortIndex="0" Type="1" ConnectionMode="0">
+    <ModelGuid>3e733ecb-c699-4af7-84a5-825a4469ce09</ModelGuid>
+  </MakeConnectionCommand>
+  <MakeConnectionCommand PortIndex="0" Type="0" ConnectionMode="1">
+    <ModelGuid>172e2138-386a-4da1-87cc-43843b142d7b</ModelGuid>
+  </MakeConnectionCommand>
+  <CreateNodeCommand X="0" Y="0" DefaultPosition="true" TransformCoordinates="true">
+    <ModelGuid>e2f85c04-d992-41dd-8e0b-1def88f2c834</ModelGuid>
+    <Dynamo.Nodes.DSFunction guid="e2f85c04-d992-41dd-8e0b-1def88f2c834" type="Dynamo.Nodes.DSFunction" nickname="Image.Pixels" x="283.5" y="259.5" isVisible="true" isUpstreamVisible="true" lacing="Shortest" assembly="DSCoreNodes.dll" function="DSCore.IO.Image.Pixels@var,int,int" />
+  </CreateNodeCommand>
+  <MakeConnectionCommand PortIndex="0" Type="1" ConnectionMode="0">
+    <ModelGuid>3e733ecb-c699-4af7-84a5-825a4469ce09</ModelGuid>
+  </MakeConnectionCommand>
+  <MakeConnectionCommand PortIndex="0" Type="0" ConnectionMode="1">
+    <ModelGuid>e2f85c04-d992-41dd-8e0b-1def88f2c834</ModelGuid>
+  </MakeConnectionCommand>
+  <SelectModelCommand Modifiers="0">
+    <ModelGuid>00000000-0000-0000-0000-000000000000</ModelGuid>
+  </SelectModelCommand>
+  <SelectInRegionCommand X="240" Y="315" Width="0" Height="0" IsCrossSelection="false" />
+  <SelectModelCommand Modifiers="0">
+    <ModelGuid>41efd68c-238c-47c6-a6f3-8aec3615e6ab</ModelGuid>
+  </SelectModelCommand>
+  <DragSelectionCommand X="83" Y="306" DragOperation="0" />
+  <DragSelectionCommand X="83" Y="306" DragOperation="1" />
+  <MakeConnectionCommand PortIndex="1" Type="0" ConnectionMode="0">
+    <ModelGuid>e2f85c04-d992-41dd-8e0b-1def88f2c834</ModelGuid>
+  </MakeConnectionCommand>
+  <MakeConnectionCommand PortIndex="0" Type="1" ConnectionMode="1">
+    <ModelGuid>41efd68c-238c-47c6-a6f3-8aec3615e6ab</ModelGuid>
+  </MakeConnectionCommand>
+  <MakeConnectionCommand PortIndex="0" Type="1" ConnectionMode="0">
+    <ModelGuid>41efd68c-238c-47c6-a6f3-8aec3615e6ab</ModelGuid>
+  </MakeConnectionCommand>
+  <MakeConnectionCommand PortIndex="2" Type="0" ConnectionMode="1">
+    <ModelGuid>e2f85c04-d992-41dd-8e0b-1def88f2c834</ModelGuid>
+  </MakeConnectionCommand>
+  <SelectModelCommand Modifiers="0">
+    <ModelGuid>e2f85c04-d992-41dd-8e0b-1def88f2c834</ModelGuid>
+  </SelectModelCommand>
+  <DragSelectionCommand X="404" Y="270" DragOperation="0" />
+  <DragSelectionCommand X="341" Y="283" DragOperation="1" />
+  <RunCancelCommand ShowErrors="false" CancelRun="false" />
+  <RunCancelCommand ShowErrors="false" CancelRun="false" />
+  <PausePlaybackCommand Tag="FirstRun" PauseDurationInMs="20" />
+  <SelectModelCommand Modifiers="0">
+    <ModelGuid>00000000-0000-0000-0000-000000000000</ModelGuid>
+  </SelectModelCommand>
+  <SelectInRegionCommand X="365" Y="43" Width="0" Height="0" IsCrossSelection="false" />
+  <SelectModelCommand Modifiers="0">
+    <ModelGuid>e2f85c04-d992-41dd-8e0b-1def88f2c834</ModelGuid>
+  </SelectModelCommand>
+  <DragSelectionCommand X="427" Y="384" DragOperation="0" />
+  <DragSelectionCommand X="427" Y="384" DragOperation="1" />
+  <SelectModelCommand Modifiers="0">
+    <ModelGuid>00000000-0000-0000-0000-000000000000</ModelGuid>
+  </SelectModelCommand>
+  <SelectInRegionCommand X="128" Y="490" Width="0" Height="0" IsCrossSelection="false" />
+  <SelectModelCommand Modifiers="0">
+    <ModelGuid>00000000-0000-0000-0000-000000000000</ModelGuid>
+  </SelectModelCommand>
+  <UpdateModelValueCommand Name="Code" Value="5;" WorkspaceGuid="0435c788-4857-4e25-a34f-e9caa4941ee0">
+    <ModelGuid>41efd68c-238c-47c6-a6f3-8aec3615e6ab</ModelGuid>
+  </UpdateModelValueCommand>
+  <SelectModelCommand Modifiers="0">
+    <ModelGuid>00000000-0000-0000-0000-000000000000</ModelGuid>
+  </SelectModelCommand>
+  <SelectInRegionCommand X="132" Y="430" Width="0" Height="0" IsCrossSelection="false" />
+  <RunCancelCommand ShowErrors="false" CancelRun="false" />
+  <PausePlaybackCommand Tag="SecondRun" PauseDurationInMs="20" />
+</Commands>
\ No newline at end of file
diff --git a/test/core/recorded/bug.PNG b/test/core/recorded/bug.PNG
new file mode 100644
index 00000000000..609006a23ec
Binary files /dev/null and b/test/core/recorded/bug.PNG differ